1
0
mirror of https://github.com/KDE/latte-dock.git synced 2024-12-23 13: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:
l10n daemon script 2022-05-29 01:45:51 +00:00
parent 917e928dbd
commit ac3505b076
7 changed files with 21 additions and 7 deletions

View File

@ -15,7 +15,8 @@
"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"
}
],
"Category": "",
@ -33,6 +34,7 @@
"Description[tr]": "Latte Rıhtım tarafından sağlanan kapsama",
"Description[uk]": "Контейнер панелі Латте",
"Description[x-test]": "xxContainment provided for the Latte Dockxx",
"Description[zh_CN]": "用于 Latte 停靠栏的容器",
"EnabledByDefault": true,
"Id": "org.kde.latte.containment",
"License": "GPL",

View File

@ -15,7 +15,8 @@
"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"
}
],
"Dependencies": [],
@ -32,6 +33,7 @@
"Description[tr]": "Normalde sağ tıklama ile gösterilen Latte menüsü",
"Description[uk]": "Меню Латте, яке буде показано у відповідь на клацання правою кнопкою миші",
"Description[x-test]": "xxThe latte menu that normally shows on right-clickxx",
"Description[zh_CN]": "通常在右键点击时显示的 latte 菜单",
"EnabledByDefault": true,
"Icon": "help-contextual",
"Id": "org.kde.latte.contextmenu",

View File

@ -15,7 +15,8 @@
"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"
}
],
"Category": "Latte Indicator",
@ -32,6 +33,7 @@
"Description[tr]": "Latte öntanımlı göstergesi",
"Description[uk]": "Типовий індикатор Латте",
"Description[x-test]": "xxLatte default indicatorxx",
"Description[zh_CN]": "Latte 默认指示器",
"EnabledByDefault": true,
"Icon": "latte-dock",
"Id": "org.kde.latte.default",

View File

@ -15,7 +15,8 @@
"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"
}
],
"Category": "Latte Indicator",
@ -32,6 +33,7 @@
"Description[tr]": "Latte Plasma biçemli gösterge",
"Description[uk]": "Індикатор стилю Плазми Латте",
"Description[x-test]": "xxLatte Plasma style indicatorxx",
"Description[zh_CN]": "Latte Plasma 风格指示器",
"EnabledByDefault": true,
"Icon": "latte-dock",
"Id": "org.kde.latte.plasma",

View File

@ -15,7 +15,8 @@
"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"
}
],
"Category": "Latte Indicator",
@ -32,6 +33,7 @@
"Description[tr]": "Latte için Plasma sekme biçemi göstergesi",
"Description[uk]": "Індикатор стилю вкладок Плазми для Латте",
"Description[x-test]": "xxPlasma Tab style indicator for Lattexx",
"Description[zh_CN]": "Latte 的 Plasma 标签页风格指示器",
"EnabledByDefault": true,
"Icon": "latte-dock",
"Id": "org.kde.latte.plasmatabstyle",

View File

@ -15,7 +15,8 @@
"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"
}
],
"Category": "Windows and Tasks",
@ -32,6 +33,7 @@
"Description[tr]": "Latte Rıhtım'dan görevler Plasmoid'i",
"Description[uk]": "Плазмоїд завдань з панелі Латте",
"Description[x-test]": "xxTasks plasmoid from Latte Dockxx",
"Description[zh_CN]": "Latte 停靠栏的任务管理 Plasma 部件",
"EnabledByDefault": true,
"Icon": "latte-dock",
"Id": "org.kde.latte.plasmoid",

View File

@ -15,7 +15,8 @@
"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"
}
],
"Description": "Shell provided for the Latte Dock",
@ -31,6 +32,7 @@
"Description[tr]": "Latte Rıhtım için sağlanan kabuk",
"Description[uk]": "Оболонка панелі Латте",
"Description[x-test]": "xxShell provided for the Latte Dockxx",
"Description[zh_CN]": "用于 Latte 停靠栏的 Shell",
"Id": "org.kde.latte.shell",
"License": "GPLv3+",
"Name": "Latte Shell",