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"
pull/24/head
l10n daemon script 3 years ago
parent 866fc3eb16
commit 1c9ec6ef73

@ -3,12 +3,24 @@
"Authors": [
{
"Email": "mvourlakos@gmail.com, audoban@openmailbox.org",
"Name": "Michail Vourlakos, Smith Ar"
"Name": "Michail Vourlakos, Smith Ar",
"Name[ca@valencia]": "Michail Vourlakos, Smith Ar",
"Name[ca]": "Michail Vourlakos, Smith Ar",
"Name[pt]": "Michail Vourlakos, Smith Ar",
"Name[sv]": "Michail Vourlakos, Smith Ar",
"Name[uk]": "Михаїл Ворлакос (Michail Vourlakos), Сміт Ар (Smith Ar)",
"Name[x-test]": "xxMichail Vourlakos, Smith Arxx"
}
],
"Category": "",
"Dependencies": [],
"Description": "Containment provided for the Latte Dock",
"Description[ca@valencia]": "Contenidor proporcionat per Latte Dock",
"Description[ca]": "Contenidor proporcionat pel Latte Dock",
"Description[pt]": "Contentor oferecido para a área acoplável do Latte",
"Description[sv]": "Omgivning tillhandahållen för Latte dockningsfönster",
"Description[uk]": "Контейнер панелі Латте",
"Description[x-test]": "xxContainment provided for the Latte Dockxx",
"EnabledByDefault": true,
"Id": "org.kde.latte.containment",
"License": "GPL",

@ -3,11 +3,23 @@
"Authors": [
{
"Email": "mvourlakos@gmail.com",
"Name": "Michail Vourlakos"
"Name": "Michail Vourlakos",
"Name[ca@valencia]": "Michail Vourlakos",
"Name[ca]": "Michail Vourlakos",
"Name[pt]": "Michail Vourlakos",
"Name[sv]": "Michail Vourlakos",
"Name[uk]": "Михаїл Ворлакос (Michail Vourlakos)",
"Name[x-test]": "xxMichail Vourlakosxx"
}
],
"Dependencies": [],
"Description": "The latte menu that normally shows on right-click",
"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[pt]": "O menu do Latte que normalmente aparece com o botão direito do rato",
"Description[sv]": "Menyn i Latte som normalt visas vid högerklick",
"Description[uk]": "Меню Латте, яке буде показано у відповідь на клацання правою кнопкою миші",
"Description[x-test]": "xxThe latte menu that normally shows on right-clickxx",
"EnabledByDefault": true,
"Icon": "help-contextual",
"Id": "org.kde.latte.contextmenu",

@ -3,11 +3,23 @@
"Authors": [
{
"Email": "mvourlakos@gmail.com",
"Name": "Michail Vourlakos"
"Name": "Michail Vourlakos",
"Name[ca@valencia]": "Michail Vourlakos",
"Name[ca]": "Michail Vourlakos",
"Name[pt]": "Michail Vourlakos",
"Name[sv]": "Michail Vourlakos",
"Name[uk]": "Михаїл Ворлакос (Michail Vourlakos)",
"Name[x-test]": "xxMichail Vourlakosxx"
}
],
"Category": "Latte Indicator",
"Description": "Latte default indicator",
"Description[ca@valencia]": "Indicador predeterminat de Latte",
"Description[ca]": "Indicador predeterminat del Latte",
"Description[pt]": "Indicador predefinido do Latte",
"Description[sv]": "Latte standardindikator",
"Description[uk]": "Типовий індикатор Латте",
"Description[x-test]": "xxLatte default indicatorxx",
"EnabledByDefault": true,
"Icon": "latte-dock",
"Id": "org.kde.latte.default",

@ -3,11 +3,23 @@
"Authors": [
{
"Email": "mvourlakos@gmail.com",
"Name": "Michail Vourlakos"
"Name": "Michail Vourlakos",
"Name[ca@valencia]": "Michail Vourlakos",
"Name[ca]": "Michail Vourlakos",
"Name[pt]": "Michail Vourlakos",
"Name[sv]": "Michail Vourlakos",
"Name[uk]": "Михаїл Ворлакос (Michail Vourlakos)",
"Name[x-test]": "xxMichail Vourlakosxx"
}
],
"Category": "Latte Indicator",
"Description": "Latte Plasma style indicator",
"Description[ca@valencia]": "Indicador a l'estil Plasma de Latte",
"Description[ca]": "Indicador a l'estil Plasma del Latte",
"Description[pt]": "Indicador de estilo do Plasma no Latte",
"Description[sv]": "Latte Plasmastilindikator",
"Description[uk]": "Індикатор стилю Плазми Латте",
"Description[x-test]": "xxLatte Plasma style indicatorxx",
"EnabledByDefault": true,
"Icon": "latte-dock",
"Id": "org.kde.latte.plasma",

@ -3,11 +3,23 @@
"Authors": [
{
"Email": "mvourlakos@gmail.com",
"Name": "Michail Vourlakos"
"Name": "Michail Vourlakos",
"Name[ca@valencia]": "Michail Vourlakos",
"Name[ca]": "Michail Vourlakos",
"Name[pt]": "Michail Vourlakos",
"Name[sv]": "Michail Vourlakos",
"Name[uk]": "Михаїл Ворлакос (Michail Vourlakos)",
"Name[x-test]": "xxMichail Vourlakosxx"
}
],
"Category": "Latte Indicator",
"Description": "Plasma Tab style indicator for 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[pt]": "Indicador do estilo de Páginas do Plasma para o Latte",
"Description[sv]": "Plasma flikstilsindikator för Latte",
"Description[uk]": "Індикатор стилю вкладок Плазми для Латте",
"Description[x-test]": "xxPlasma Tab style indicator for Lattexx",
"EnabledByDefault": true,
"Icon": "latte-dock",
"Id": "org.kde.latte.plasmatabstyle",

@ -3,11 +3,23 @@
"Authors": [
{
"Email": "mvourlakos@gmail.com, audoban@openmailbox.org",
"Name": "Michail Vourlakos, Smith Ar"
"Name": "Michail Vourlakos, Smith Ar",
"Name[ca@valencia]": "Michail Vourlakos, Smith Ar",
"Name[ca]": "Michail Vourlakos, Smith Ar",
"Name[pt]": "Michail Vourlakos, Smith Ar",
"Name[sv]": "Michail Vourlakos, Smith Ar",
"Name[uk]": "Михаїл Ворлакос (Michail Vourlakos), Сміт Ар (Smith Ar)",
"Name[x-test]": "xxMichail Vourlakos, Smith Arxx"
}
],
"Category": "Windows and Tasks",
"Description": "Tasks plasmoid from Latte Dock",
"Description[ca@valencia]": "Plasmoide de tasques de Latte Dock",
"Description[ca]": "Plasmoide de tasques del Latte Dock",
"Description[pt]": "Plasmóide de tarefas da Área Acoplável do Latte",
"Description[sv]": "Aktivitetsplasmoid för Latte dockningsfönster",
"Description[uk]": "Плазмоїд завдань з панелі Латте",
"Description[x-test]": "xxTasks plasmoid from Latte Dockxx",
"EnabledByDefault": true,
"Icon": "latte-dock",
"Id": "org.kde.latte.plasmoid",

@ -3,10 +3,22 @@
"Authors": [
{
"Email": "mvourlakos@gmail.com, audoban@openmailbox.org",
"Name": "Michail Vourlakos, Smith Ar"
"Name": "Michail Vourlakos, Smith Ar",
"Name[ca@valencia]": "Michail Vourlakos, Smith Ar",
"Name[ca]": "Michail Vourlakos, Smith Ar",
"Name[pt]": "Michail Vourlakos, Smith Ar",
"Name[sv]": "Michail Vourlakos, Smith Ar",
"Name[uk]": "Михаїл Ворлакос (Michail Vourlakos), Сміт Ар (Smith Ar)",
"Name[x-test]": "xxMichail Vourlakos, Smith Arxx"
}
],
"Description": "Shell provided for the Latte Dock",
"Description[ca@valencia]": "Intèrpret d'ordres proporcionat per Latte Dock",
"Description[ca]": "Intèrpret d'ordres proporcionat pel Latte Dock",
"Description[pt]": "Consola oferecida para a área acoplável do Latte",
"Description[sv]": "Skal tillhandahållet för Latte dockningsfönster",
"Description[uk]": "Оболонка панелі Латте",
"Description[x-test]": "xxShell provided for the Latte Dockxx",
"Id": "org.kde.latte.shell",
"License": "GPLv3+",
"Name": "Latte Shell",

Loading…
Cancel
Save