From 692b46846bf456239f11f0127f1751ef31c7511e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 27 May 2022 02:43:15 +0000 Subject: [PATCH] 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" --- app/latte-indicators.knsrc | 1 + app/latte-layouts.knsrc | 1 + app/lattedock.notifyrc | 3 +++ app/org.kde.latte-dock.desktop.cmake | 2 ++ app/packageplugins/indicator/latte-indicator.desktop | 1 + 5 files changed, 8 insertions(+) diff --git a/app/latte-indicators.knsrc b/app/latte-indicators.knsrc index 39fe03c72..031539f60 100644 --- a/app/latte-indicators.knsrc +++ b/app/latte-indicators.knsrc @@ -26,6 +26,7 @@ Name[ru]=Индикаторы Latte Name[sk]=Indikátory Latte Name[sl]=Kazalniki Latte Name[sv]=Latte indikatorer +Name[tr]=Latte Göstergeleri Name[uk]=Індикатори Латте Name[x-test]=xxLatte Indicatorsxx Name[zh_CN]=Latte 指示器 diff --git a/app/latte-layouts.knsrc b/app/latte-layouts.knsrc index 8da7fb918..11b3da7d3 100644 --- a/app/latte-layouts.knsrc +++ b/app/latte-layouts.knsrc @@ -28,6 +28,7 @@ Name[ru]=Макеты Latte Name[sk]=Rozloženia Latte Name[sl]=Postavitve Latte Name[sv]=Latte layouter +Name[tr]=Latte Yerleşimleri Name[uk]=Компонування Латте Name[x-test]=xxLatte Layoutsxx Name[zh_CN]=Latte 布局 diff --git a/app/lattedock.notifyrc b/app/lattedock.notifyrc index 11db54c5c..7ab52637d 100644 --- a/app/lattedock.notifyrc +++ b/app/lattedock.notifyrc @@ -29,6 +29,7 @@ Name[ru]=Latte Dock Name[sk]=Dok Latte Name[sl]=Latte Dock Name[sv]=Latte dockningsfönster +Name[tr]=Latte Rıhtım Name[uk]=Панель Латте Name[x-test]=xxLatte Dockxx Name[zh_CN]=Latte 停靠栏 @@ -63,6 +64,7 @@ Comment[ru]=Latte Dock Comment[sk]=Dok Latte Comment[sl]=Latte Dock Comment[sv]=Latte dockningsfönster +Comment[tr]=Latte Rıhtım Comment[uk]=Панель Латте Comment[x-test]=xxLatte Dockxx Comment[zh_CN]=Latte 停靠栏 @@ -316,6 +318,7 @@ Name[ru]=Использовать макет Name[sk]=Prepnúť na rozloženie Name[sl]=Preklop na postavitev Name[sv]=Byt till layout +Name[tr]=Yerleşime geç Name[uk]=Перемкнутися на компонування Name[x-test]=xxSwitch to layoutxx Name[zh_CN]=切换布局 diff --git a/app/org.kde.latte-dock.desktop.cmake b/app/org.kde.latte-dock.desktop.cmake index e266a3e0b..77073de21 100644 --- a/app/org.kde.latte-dock.desktop.cmake +++ b/app/org.kde.latte-dock.desktop.cmake @@ -62,6 +62,7 @@ Comment[ru]=Док для всех Comment[sk]=Dok pre davy ľudí Comment[sl]=Dok za množice Comment[sv]=Dockningsfönster för alla +Comment[tr]=Kitleler için rıhtım Comment[uk]=Панель для усіх Comment[x-test]=xxDock for the massesxx Comment[zh_CN]=给大众使用的停靠栏 @@ -96,6 +97,7 @@ GenericName[ru]=Док GenericName[sk]=Dok GenericName[sl]=Dok GenericName[sv]=Dockningsfönster +GenericName[tr]=Rıhtım GenericName[uk]=Панель GenericName[x-test]=xxDockxx GenericName[zh_CN]=停靠栏 diff --git a/app/packageplugins/indicator/latte-indicator.desktop b/app/packageplugins/indicator/latte-indicator.desktop index 10c7024e2..d1b9f1b5f 100644 --- a/app/packageplugins/indicator/latte-indicator.desktop +++ b/app/packageplugins/indicator/latte-indicator.desktop @@ -29,6 +29,7 @@ Comment[ru]=Индикатор Latte Comment[sk]=Latte indicator Comment[sl]=Kazalnik Latte Comment[sv]=Latte indikator +Comment[tr]=Latte göstergesi Comment[uk]=Індикатор Латте Comment[x-test]=xxLatte indicatorxx Comment[zh_CN]=Latte 任务指示器