From 13b19c407aee2c18e22bcf6a3c3e4c5cc36a436f Mon Sep 17 00:00:00 2001 From: deblan Date: Sat, 5 Nov 2022 11:36:33 +0000 Subject: [PATCH 01/16] Added translation using Weblate (Dutch) --- src/l10n/fixtures/nl.yaml | 92 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 src/l10n/fixtures/nl.yaml diff --git a/src/l10n/fixtures/nl.yaml b/src/l10n/fixtures/nl.yaml new file mode 100644 index 0000000..4a86b0e --- /dev/null +++ b/src/l10n/fixtures/nl.yaml @@ -0,0 +1,92 @@ +"Custom menu": "" +"Enable the custom menu": "" +"No": "" +"Yes": "" +"Menu": "" +? 'Use the shortcut Ctrl+o to open and to hide the side menu. Use tab to navigate.' +: '' +"Top menu": "" +"Apps that not must be moved in the side menu": "" +"If there is no selection then the global configuration is applied.": "" +"Experimental": "" +"Save": "" +"You like this app and you want to support me?": "" +"Buy me a coffee ☕": "" +"Hidden": "" +"Small": "" +"Normal": "" +"Big": "" +"Hidden icon": "" +"Small icon": "" +"Normal icon": "" +"Big icon": "" +"Hidden text": "" +"Small text": "" +"Normal text": "" +"Big text": "" +"Colors": "" +"Background color": "" +"Background color of current app": "" +"Text color": "" +"Loader": "" +"Icon": "" +"Same color": "" +"Opposite color": "" +"Transparent": "" +"Opaque": "" +"Opener": "" +"Default": "" +"Default (dark)": "" +"Hamburger": "" +"Hamburger (dark)": "" +"Hamburger 2": "" +"Hamburger 2 (dark)": "" +"Before the logo": "" +"After the logo": "" +"Position": "" +"Show only the opener (hidden logo)": "" +"Do not display the side menu and the opener if there is no application (eg: public pages).": "" +"Panel": "" +"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "" +"Display the big menu": "" +"Display the logo": "" +"Icons and texts": "" +"Loader enabled": "" +"Tips": "" +"Always displayed": "" +"This is the automatic behavior when the menu is always displayed.": "" +"Not compatible with touch screens.": "" +"Big menu": "" +"Live preview": "" +"Open apps in new tab": "" +"Use the global setting": "" +"Use my selection": "" +"Show and hide the list of applications": "" +"Use the avatar instead of the logo": "" +"You do not have permission to change the settings.": "" +"Force this configuration to users": "" +"Export the configuration": "" +"Purge the cache": "" +"Show the link to settings": "" +"The menu is enabled by default for users": "" +"Except when the configuration is forced.": "" +"Apps that should not be displayed in the menu": "" +"This feature is only compatible with the big menu display.": "" +"The logo is a link to the default app": "" +"Others": "" +"Categories": "" +"Customize sorting": "" +"Order by": "" +"Name": "" +"Customed": "" +"Show and hide the list of categories": "" +"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "" +"Dark mode colors": "" +"With categories": "" +"Custom categories": "" +"Customize application categories": "" +"Reset to default": "" +"Applications": "" +"Applications kept in the top menu": "" +"Applications kept in the top menu but also shown in side menu": "" +"These applications must be selected in the previous option.": "" From 84d1dff0ffdf5d80e0981be3a9dd97bc17cb87e8 Mon Sep 17 00:00:00 2001 From: p-bo Date: Wed, 9 Nov 2022 20:06:00 +0000 Subject: [PATCH 02/16] Translated using Weblate (Czech) Currently translated at 100.0% (91 of 91 strings) Translation: Custom menu/Application Translate-URL: https://translate.codeberg.org/projects/custom-menu/application/cs/ --- src/l10n/fixtures/cs.yaml | 50 +++++++++++++-------------------------- 1 file changed, 16 insertions(+), 34 deletions(-) diff --git a/src/l10n/fixtures/cs.yaml b/src/l10n/fixtures/cs.yaml index 08033d0..88cedd2 100644 --- a/src/l10n/fixtures/cs.yaml +++ b/src/l10n/fixtures/cs.yaml @@ -3,21 +3,14 @@ "No": "Ne" "Yes": "Ano" "Menu": "Nabídka" -? 'Use the shortcut Ctrl+o - to open and to hide the side menu. Use tab to - navigate.' -: 'Pro otevření/skrytí postranní nabídky použijte zkratku Ctrl+O („O“ jako otevřít). Pro pohyb po použijte klávesu - Tab.' +? 'Use the shortcut Ctrl+o to open and to hide the side menu. Use tab to navigate.' +: 'Pro otevření/skrytí postranní nabídky použijte zkratku Ctrl+O („O“ jako otevřít). Pro pohyb po použijte klávesu Tab.' "Top menu": "Horní nabídka" -"Apps that not must be moved in the side menu": "Aplikace, které nepřesouvat do postranní\ - \ nabídky" -"If there is no selection then the global configuration is applied.": "Pokud neexistuje\ - \ žádný výběr, je uplatněno globální nastavení." +"Apps that not must be moved in the side menu": "Aplikace, které nepřesouvat do postranní nabídky" +"If there is no selection then the global configuration is applied.": "Pokud neexistuje žádný výběr, je uplatněno globální nastavení." "Experimental": "Experimentální" "Save": "Uložit" -"You like this app and you want to support me?": "Líbí se vám tato aplikace a chcete\ - \ podpořit její vývoj?" +"You like this app and you want to support me?": "Líbí se vám tato aplikace a chcete podpořit její vývoj?" "Buy me a coffee ☕": "Kupte mi kafe ☕" "Hidden": "Skryté" "Small": "Malé" @@ -44,21 +37,16 @@ "After the logo": "Za logem" "Position": "Pozice" "Show only the opener (hidden logo)": "Zobrazovat pouze otevírací tlačítko (logo skryto)" -"Do not display the side menu and the opener if there is no application (eg: public pages).": "Nezobrazovat\ - \ postranní nabídku a její otevírací tlačítko pokud nejsou dostupné žádné aplikace\ - \ (např. na veřejných stránkách)." +"Do not display the side menu and the opener if there is no application (eg: public pages).": "Nezobrazovat postranní nabídku a její otevírací tlačítko pokud nejsou dostupné žádné aplikace (např. na veřejných stránkách)." "Panel": "Panel" -"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Otevřít\ - \ nabídku při najetím ukazatelem na tlačítko nabídky (automaticky vypnuto pro dotykové\ - \ obrazovky)" +"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Otevřít nabídku při najetím ukazatelem na tlačítko nabídky (automaticky vypnuto pro dotykové obrazovky)" "Display the big menu": "Zobrazit velkou nabídku" "Display the logo": "Zobrazit logo" "Icons and texts": "Ikony a texty" "Loader enabled": "Načítání zapnuto" "Tips": "Tipy" "Always displayed": "Vždy zobrazeno" -"This is the automatic behavior when the menu is always displayed.": "Toto je automatické\ - \ chování, kdy je nabídka vždy zobrazena." +"This is the automatic behavior when the menu is always displayed.": "Toto je automatické chování, kdy je nabídka vždy zobrazena." "Not compatible with touch screens.": "Nekompatibilní s dotykovými obrazovkami." "Big menu": "Velká nabídka" "Live preview": "Živý náhled" @@ -72,13 +60,10 @@ "Export the configuration": "Exportovat nastavení" "Purge the cache": "Vyprázdnit mezipaměť" "Show the link to settings": "Zobrazit odkaz na nastavení" -"The menu is enabled by default for users": "Nabídka je ve výchozím stavu pro uživatele\ - \ zapnutá" +"The menu is enabled by default for users": "Nabídka je ve výchozím stavu pro uživatele zapnutá" "Except when the configuration is forced.": "S výjimkou, kdy je nastavení vynuceno." -"Apps that should not be displayed in the menu": "Aplikace, které by neměly být v\ - \ nabídce zobrazeny" -"This feature is only compatible with the big menu display.": "Tato funkce\ - \ je kompatibilní pouze s velkou nabídkou." +"Apps that should not be displayed in the menu": "Aplikace, které by neměly být v nabídce zobrazeny" +"This feature is only compatible with the big menu display.": "Tato funkce je kompatibilní pouze s velkou nabídkou." "The logo is a link to the default app": "Logo je odkaz na výchozí aplikaci" "Others": "Ostatní" "Categories": "Kategorie" @@ -87,8 +72,7 @@ "Name": "Název" "Customed": "Přizpůsobeno" "Show and hide the list of categories": "Zobrazit/skrýt seznam kategorií" -"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "Tyto\ - \ parametry jsou použity v případě, že je zapnutý (Breeze) tmavý motiv vzhledu." +"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "Tyto parametry jsou použity v případě, že je zapnutý (Breeze) tmavý motiv vzhledu." "Dark mode colors": "Barvy tmavého režimu" "With categories": "S kategoriemi" "Custom categories": "Vlastní kategorie" @@ -102,9 +86,7 @@ "Small text": "Malý text" "Normal text": "Normální text" "Big text": "Velký text" -"Applications": "Applications" -"Applications kept in the top menu": "Applications kept in the top menu" -"Applications kept in the top menu but also shown in side menu": "Applications kept\ - \ in the top menu but also shown in side menu" -"These applications must be selected in the previous option.": "These applications\ - \ must be selected in the previous option." +"Applications": "Aplikace" +"Applications kept in the top menu": "Aplikace ponechané v horní nabídce" +"Applications kept in the top menu but also shown in side menu": "Aplikace ponechané v horní nabídce ale také zobrazené v té boční" +"These applications must be selected in the previous option.": "Tyto aplikace je třeba vybrat v předchozí volbě." From b474eeb29abca5694b74088328916f25051c47c2 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Fri, 11 Nov 2022 21:20:15 +0100 Subject: [PATCH 03/16] update changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e53563a..e66c3b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ ## [Unreleased] +### Added +* add translations (thanks to Pavelb) + ## 3.3.2 ### Fixed * fix #173: reduce the height of categories list From a4060c8db7a141a263cb37c114a9a718b5646b4e Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 20 Nov 2022 14:00:26 +0100 Subject: [PATCH 04/16] add possibility to define side_menu as default app and redirect to the first top menu app (#177) --- README.md | 8 +++ appinfo/routes.php | 1 + lib/Controller/AppController.php | 102 +++++++++++++++++++++++++++++++ 3 files changed, 111 insertions(+) create mode 100644 lib/Controller/AppController.php diff --git a/README.md b/README.md index b1686e0..03a77a1 100644 --- a/README.md +++ b/README.md @@ -47,6 +47,14 @@ Users can disable the menu using the page of personal settings. Use the shortcut `Ctrl`+`o` to open and to hide the side menu. Use `tab` to navigate. +### Use first top menu app as default app + +You can easily let Nextcloud redirect to the first top menu app by changing the following parameter in your `config/config.php`: + +``` +'defaultapp' => 'side_menu', +``` + How to contribute? ------------------ diff --git a/appinfo/routes.php b/appinfo/routes.php index 1efd4b6..bdc3fba 100644 --- a/appinfo/routes.php +++ b/appinfo/routes.php @@ -19,6 +19,7 @@ return [ 'routes' => [ + ['name' => 'App#index', 'url' => '/', 'verb' => 'GET'], ['name' => 'Css#stylesheet', 'url' => '/css/stylesheet', 'verb' => 'GET'], ['name' => 'Js#script', 'url' => '/js/script', 'verb' => 'GET'], ['name' => 'Js#config', 'url' => '/js/config', 'verb' => 'GET'], diff --git a/lib/Controller/AppController.php b/lib/Controller/AppController.php new file mode 100644 index 0000000..1d3de92 --- /dev/null +++ b/lib/Controller/AppController.php @@ -0,0 +1,102 @@ +. + */ + +namespace OCA\SideMenu\Controller; + +use OC; +use OCA\SideMenu\Service\AppRepository; +use OCA\SideMenu\Service\ConfigProxy; +use OCP\AppFramework\Controller; +use OCP\AppFramework\Http\RedirectResponse; +use OCP\IRequest; +use OCP\IURLGenerator; +use OCP\IUserSession; + +class AppController extends Controller +{ + /** + * @var ConfigProxy + */ + protected $config; + + /** + * @var AppRepository + */ + protected $appRepository; + + public function __construct( + string $appName, + IRequest $request, + AppRepository $appRepository, + IURLGenerator $urlGenerator, + ConfigProxy $config + ) { + parent::__construct($appName, $request); + + $this->appRepository = $appRepository; + $this->urlGenerator = $urlGenerator; + $this->config = $config; + } + + /** + * @NoAdminRequired + * @NoCSRFRequired + */ + public function index(): RedirectResponse + { + $user = OC::$server[IUserSession::class]->getUser(); + $topMenuApps = $this->config->getAppValueArray('top-menu-apps', '[]'); + $hiddenApps = $this->config->getAppValueArray('big-menu-hidden-apps', '[]'); + $isForced = $this->config->getAppValueBool('force', '0'); + $userTopMenuApps = $this->config->getUserValueArray($user, 'top-menu-apps', '[]'); + $apps = $this->appRepository->getOrderedApps($user); + + if (!$isForced && !empty($userTopMenuApps)) { + $topMenuApps = $userTopMenuApps; + } + + foreach ($apps as $app) { + $inTopMenuApps = in_array($app['id'], $topMenuApps); + $inHiddenApps = in_array($app['id'], $hiddenApps); + + if (!$inTopMenuApps || $inHiddenApps) { + continue; + } + + return $this->redirectToApp($app['id']); + } + + return $this->redirectToApp('files'); + } + + protected function redirectToApp($appId): RedirectResponse + { + $isIgnoreFrontController = true === OC::$server->getConfig()->getSystemValue('htaccess.IgnoreFrontController', false); + $isFrontControllerActive = 'true' === getenv('front_controller_active'); + + if ($isIgnoreFrontController || $isFrontControllerActive) { + $path = '/apps/%s/'; + } else { + $path = '/index.php/apps/%s/'; + } + + $url = $this->urlGenerator->getAbsoluteURL(sprintf($path, $appId)); + + return new RedirectResponse($url); + } +} From 3ccf754e0dce6b79e27bfaf2395c2e3916581fbb Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 20 Nov 2022 14:00:33 +0100 Subject: [PATCH 05/16] add possibility to define side_menu as default app and redirect to the first top menu app (#177) --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 03a77a1..e5e90b4 100644 --- a/README.md +++ b/README.md @@ -49,12 +49,14 @@ Use the shortcut `Ctrl`+`o` to open and to hide the side menu. Use `tab` to navi ### Use first top menu app as default app -You can easily let Nextcloud redirect to the first top menu app by changing the following parameter in your `config/config.php`: +You can easily let Custom Menu redirect to the first app in the top menu by changing the following parameter in your `config/config.php`: ``` 'defaultapp' => 'side_menu', ``` +If the top menu is empty then it redirects to files. + How to contribute? ------------------ From d78bb6d93bbe412b1171e4f91f0fc2f4fcbd3c52 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 20 Nov 2022 14:13:54 +0100 Subject: [PATCH 06/16] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e66c3b3..96c5b60 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ### Added * add translations (thanks to Pavelb) +* add possibility to define Custom Menu as default app and redirect to the first top menu app (#177) ## 3.3.2 ### Fixed From e208e19b1c8e96b4dbe1a3788113f98788e63b3c Mon Sep 17 00:00:00 2001 From: deblan Date: Sun, 13 Nov 2022 12:59:21 +0000 Subject: [PATCH 07/16] Added translation using Weblate (Russian) --- src/l10n/fixtures/ru.yaml | 92 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 src/l10n/fixtures/ru.yaml diff --git a/src/l10n/fixtures/ru.yaml b/src/l10n/fixtures/ru.yaml new file mode 100644 index 0000000..4a86b0e --- /dev/null +++ b/src/l10n/fixtures/ru.yaml @@ -0,0 +1,92 @@ +"Custom menu": "" +"Enable the custom menu": "" +"No": "" +"Yes": "" +"Menu": "" +? 'Use the shortcut Ctrl+o to open and to hide the side menu. Use tab to navigate.' +: '' +"Top menu": "" +"Apps that not must be moved in the side menu": "" +"If there is no selection then the global configuration is applied.": "" +"Experimental": "" +"Save": "" +"You like this app and you want to support me?": "" +"Buy me a coffee ☕": "" +"Hidden": "" +"Small": "" +"Normal": "" +"Big": "" +"Hidden icon": "" +"Small icon": "" +"Normal icon": "" +"Big icon": "" +"Hidden text": "" +"Small text": "" +"Normal text": "" +"Big text": "" +"Colors": "" +"Background color": "" +"Background color of current app": "" +"Text color": "" +"Loader": "" +"Icon": "" +"Same color": "" +"Opposite color": "" +"Transparent": "" +"Opaque": "" +"Opener": "" +"Default": "" +"Default (dark)": "" +"Hamburger": "" +"Hamburger (dark)": "" +"Hamburger 2": "" +"Hamburger 2 (dark)": "" +"Before the logo": "" +"After the logo": "" +"Position": "" +"Show only the opener (hidden logo)": "" +"Do not display the side menu and the opener if there is no application (eg: public pages).": "" +"Panel": "" +"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "" +"Display the big menu": "" +"Display the logo": "" +"Icons and texts": "" +"Loader enabled": "" +"Tips": "" +"Always displayed": "" +"This is the automatic behavior when the menu is always displayed.": "" +"Not compatible with touch screens.": "" +"Big menu": "" +"Live preview": "" +"Open apps in new tab": "" +"Use the global setting": "" +"Use my selection": "" +"Show and hide the list of applications": "" +"Use the avatar instead of the logo": "" +"You do not have permission to change the settings.": "" +"Force this configuration to users": "" +"Export the configuration": "" +"Purge the cache": "" +"Show the link to settings": "" +"The menu is enabled by default for users": "" +"Except when the configuration is forced.": "" +"Apps that should not be displayed in the menu": "" +"This feature is only compatible with the big menu display.": "" +"The logo is a link to the default app": "" +"Others": "" +"Categories": "" +"Customize sorting": "" +"Order by": "" +"Name": "" +"Customed": "" +"Show and hide the list of categories": "" +"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "" +"Dark mode colors": "" +"With categories": "" +"Custom categories": "" +"Customize application categories": "" +"Reset to default": "" +"Applications": "" +"Applications kept in the top menu": "" +"Applications kept in the top menu but also shown in side menu": "" +"These applications must be selected in the previous option.": "" From 8db686b3a289b6428f50f966d43fd1d2bda40a5a Mon Sep 17 00:00:00 2001 From: Timur Date: Wed, 16 Nov 2022 13:42:31 +0000 Subject: [PATCH 08/16] Translated using Weblate (Russian) Currently translated at 60.4% (55 of 91 strings) Translation: Custom menu/Application Translate-URL: https://translate.codeberg.org/projects/custom-menu/application/ru/ --- src/l10n/fixtures/ru.yaml | 124 +++++++++++++++++++------------------- 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/src/l10n/fixtures/ru.yaml b/src/l10n/fixtures/ru.yaml index 4a86b0e..40823a0 100644 --- a/src/l10n/fixtures/ru.yaml +++ b/src/l10n/fixtures/ru.yaml @@ -1,92 +1,92 @@ "Custom menu": "" "Enable the custom menu": "" -"No": "" -"Yes": "" -"Menu": "" +"No": "Нет" +"Yes": "Да" +"Menu": "Меню" ? 'Use the shortcut Ctrl+o to open and to hide the side menu. Use tab to navigate.' -: '' -"Top menu": "" -"Apps that not must be moved in the side menu": "" +: 'Используйте сочетание клавиш Ctrl+o, чтобы открыть или скрыть боковое меню. Используйте Tab для навигации.' +"Top menu": "Верхнее меню" +"Apps that not must be moved in the side menu": "Приложения не перемещаемые в боковое меню" "If there is no selection then the global configuration is applied.": "" -"Experimental": "" -"Save": "" -"You like this app and you want to support me?": "" -"Buy me a coffee ☕": "" -"Hidden": "" -"Small": "" -"Normal": "" -"Big": "" -"Hidden icon": "" -"Small icon": "" -"Normal icon": "" -"Big icon": "" -"Hidden text": "" -"Small text": "" -"Normal text": "" -"Big text": "" -"Colors": "" -"Background color": "" -"Background color of current app": "" -"Text color": "" -"Loader": "" -"Icon": "" -"Same color": "" +"Experimental": "Экспериментальный" +"Save": "Сохранить" +"You like this app and you want to support me?": "Вам нравится приложение или вы хотите поддержать его?" +"Buy me a coffee ☕": "Купить мне чашку кофе ☕" +"Hidden": "Скрыто" +"Small": "Маленький" +"Normal": "Средний" +"Big": "Большой" +"Hidden icon": "Скрытая иконка" +"Small icon": "Маленькая иконка" +"Normal icon": "Средняя иконка" +"Big icon": "Большая иконка" +"Hidden text": "Скрытый текст" +"Small text": "Маленький текст" +"Normal text": "Средний текст" +"Big text": "Большой текст" +"Colors": "Цвета" +"Background color": "Цвет фона" +"Background color of current app": "Цвет фона выбранного приложения" +"Text color": "Цвет текста" +"Loader": "Загрузчик" +"Icon": "Иконка" +"Same color": "Такой же цвет" "Opposite color": "" -"Transparent": "" +"Transparent": "Прозрачный" "Opaque": "" "Opener": "" -"Default": "" -"Default (dark)": "" -"Hamburger": "" -"Hamburger (dark)": "" -"Hamburger 2": "" -"Hamburger 2 (dark)": "" -"Before the logo": "" -"After the logo": "" -"Position": "" +"Default": "По-умолчанию" +"Default (dark)": "По-умолчанию (тёмный)" +"Hamburger": "Гамбургер" +"Hamburger (dark)": "Гамбургер (тёмный)" +"Hamburger 2": "Гамбургер 2" +"Hamburger 2 (dark)": "Гамбургер 2 (тёмный)" +"Before the logo": "Перед логотипом" +"After the logo": "После логотипа" +"Position": "Позиция" "Show only the opener (hidden logo)": "" "Do not display the side menu and the opener if there is no application (eg: public pages).": "" -"Panel": "" +"Panel": "Панеот" "Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "" -"Display the big menu": "" -"Display the logo": "" -"Icons and texts": "" +"Display the big menu": "Отобразить большое меню" +"Display the logo": "Показать лого" +"Icons and texts": "Иконки и текст" "Loader enabled": "" -"Tips": "" -"Always displayed": "" +"Tips": "Советы" +"Always displayed": "Всегда отображается" "This is the automatic behavior when the menu is always displayed.": "" -"Not compatible with touch screens.": "" -"Big menu": "" +"Not compatible with touch screens.": "Не совместимо с сенсорными экранами" +"Big menu": "Большое меню" "Live preview": "" -"Open apps in new tab": "" +"Open apps in new tab": "Открывать приложения в новой вкладке" "Use the global setting": "" "Use my selection": "" -"Show and hide the list of applications": "" -"Use the avatar instead of the logo": "" -"You do not have permission to change the settings.": "" +"Show and hide the list of applications": "Показать или скрыть список приложений" +"Use the avatar instead of the logo": "Использовать аватар вместо логотипа" +"You do not have permission to change the settings.": "У вас нет разрешения изменять настройки" "Force this configuration to users": "" -"Export the configuration": "" -"Purge the cache": "" +"Export the configuration": "Экспортировать конфигурацию" +"Purge the cache": "Очистить кэш" "Show the link to settings": "" "The menu is enabled by default for users": "" "Except when the configuration is forced.": "" "Apps that should not be displayed in the menu": "" "This feature is only compatible with the big menu display.": "" "The logo is a link to the default app": "" -"Others": "" -"Categories": "" +"Others": "Прочие" +"Categories": "Категории" "Customize sorting": "" -"Order by": "" -"Name": "" +"Order by": "В порядке" +"Name": "Название" "Customed": "" -"Show and hide the list of categories": "" +"Show and hide the list of categories": "Показать или скрыть список категорий" "This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "" -"Dark mode colors": "" -"With categories": "" +"Dark mode colors": "Цвета тёмной темы" +"With categories": "С категориями" "Custom categories": "" "Customize application categories": "" -"Reset to default": "" -"Applications": "" +"Reset to default": "Сбросить к значениям по-умолчанию" +"Applications": "Приложения" "Applications kept in the top menu": "" "Applications kept in the top menu but also shown in side menu": "" "These applications must be selected in the previous option.": "" From 0f93fbe7eae1c8e2b6acc1e0f86b6a09b9a345e5 Mon Sep 17 00:00:00 2001 From: deblan Date: Sun, 20 Nov 2022 13:20:57 +0000 Subject: [PATCH 09/16] Translated using Weblate (Dutch) Currently translated at 0.0% (0 of 91 strings) Translation: Custom menu/Application Translate-URL: https://translate.codeberg.org/projects/custom-menu/application/nl/ --- src/l10n/fixtures/nl.yaml | 182 +++++++++++++++++++------------------- 1 file changed, 91 insertions(+), 91 deletions(-) diff --git a/src/l10n/fixtures/nl.yaml b/src/l10n/fixtures/nl.yaml index 4a86b0e..ad417e6 100644 --- a/src/l10n/fixtures/nl.yaml +++ b/src/l10n/fixtures/nl.yaml @@ -1,92 +1,92 @@ -"Custom menu": "" -"Enable the custom menu": "" -"No": "" -"Yes": "" -"Menu": "" +"Custom menu": "Custom menu" +"Enable the custom menu": "Enable the custom menu" +"No": "No" +"Yes": "Yes" +"Menu": "Menu" ? 'Use the shortcut Ctrl+o to open and to hide the side menu. Use tab to navigate.' -: '' -"Top menu": "" -"Apps that not must be moved in the side menu": "" -"If there is no selection then the global configuration is applied.": "" -"Experimental": "" -"Save": "" -"You like this app and you want to support me?": "" -"Buy me a coffee ☕": "" -"Hidden": "" -"Small": "" -"Normal": "" -"Big": "" -"Hidden icon": "" -"Small icon": "" -"Normal icon": "" -"Big icon": "" -"Hidden text": "" -"Small text": "" -"Normal text": "" -"Big text": "" -"Colors": "" -"Background color": "" -"Background color of current app": "" -"Text color": "" -"Loader": "" -"Icon": "" -"Same color": "" -"Opposite color": "" -"Transparent": "" -"Opaque": "" -"Opener": "" -"Default": "" -"Default (dark)": "" -"Hamburger": "" -"Hamburger (dark)": "" -"Hamburger 2": "" -"Hamburger 2 (dark)": "" -"Before the logo": "" -"After the logo": "" -"Position": "" -"Show only the opener (hidden logo)": "" -"Do not display the side menu and the opener if there is no application (eg: public pages).": "" -"Panel": "" -"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "" -"Display the big menu": "" -"Display the logo": "" -"Icons and texts": "" -"Loader enabled": "" -"Tips": "" -"Always displayed": "" -"This is the automatic behavior when the menu is always displayed.": "" -"Not compatible with touch screens.": "" -"Big menu": "" -"Live preview": "" -"Open apps in new tab": "" -"Use the global setting": "" -"Use my selection": "" -"Show and hide the list of applications": "" -"Use the avatar instead of the logo": "" -"You do not have permission to change the settings.": "" -"Force this configuration to users": "" -"Export the configuration": "" -"Purge the cache": "" -"Show the link to settings": "" -"The menu is enabled by default for users": "" -"Except when the configuration is forced.": "" -"Apps that should not be displayed in the menu": "" -"This feature is only compatible with the big menu display.": "" -"The logo is a link to the default app": "" -"Others": "" -"Categories": "" -"Customize sorting": "" -"Order by": "" -"Name": "" -"Customed": "" -"Show and hide the list of categories": "" -"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "" -"Dark mode colors": "" -"With categories": "" -"Custom categories": "" -"Customize application categories": "" -"Reset to default": "" -"Applications": "" -"Applications kept in the top menu": "" -"Applications kept in the top menu but also shown in side menu": "" -"These applications must be selected in the previous option.": "" +: 'Use the shortcut Ctrl+o to open and to hide the side menu. Use tab to navigate.' +"Top menu": "Top menu" +"Apps that not must be moved in the side menu": "Apps that not must be moved in the side menu" +"If there is no selection then the global configuration is applied.": "If there is no selection then the global configuration is applied." +"Experimental": "Experimental" +"Save": "Save" +"You like this app and you want to support me?": "You like this app and you want to support me?" +"Buy me a coffee ☕": "Buy me a coffee ☕" +"Hidden": "Hidden" +"Small": "Small" +"Normal": "Normal" +"Big": "Big" +"Hidden icon": "Hidden icon" +"Small icon": "Small icon" +"Normal icon": "Normal icon" +"Big icon": "Big icon" +"Hidden text": "Hidden text" +"Small text": "Small text" +"Normal text": "Normal text" +"Big text": "Big text" +"Colors": "Colors" +"Background color": "Background color" +"Background color of current app": "Background color of current app" +"Text color": "Text color" +"Loader": "Loader" +"Icon": "Icon" +"Same color": "Same color" +"Opposite color": "Opposite color" +"Transparent": "Transparent" +"Opaque": "Opaque" +"Opener": "Opener" +"Default": "Default" +"Default (dark)": "Default (dark)" +"Hamburger": "Hamburger" +"Hamburger (dark)": "Hamburger (dark)" +"Hamburger 2": "Hamburger 2" +"Hamburger 2 (dark)": "Hamburger 2 (dark)" +"Before the logo": "Before the logo" +"After the logo": "After the logo" +"Position": "Position" +"Show only the opener (hidden logo)": "Show only the opener (hidden logo)" +"Do not display the side menu and the opener if there is no application (eg: public pages).": "Do not display the side menu and the opener if there is no application (eg: public pages)." +"Panel": "Panel" +"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Open the menu when the mouse is hover the opener (automatically disabled on touch screens)" +"Display the big menu": "Display the big menu" +"Display the logo": "Display the logo" +"Icons and texts": "Icons and texts" +"Loader enabled": "Loader enabled" +"Tips": "Tips" +"Always displayed": "Always displayed" +"This is the automatic behavior when the menu is always displayed.": "This is the automatic behavior when the menu is always displayed." +"Not compatible with touch screens.": "Not compatible with touch screens." +"Big menu": "Big menu" +"Live preview": "Live preview" +"Open apps in new tab": "Open apps in new tab" +"Use the global setting": "Use the global setting" +"Use my selection": "Use my selection" +"Show and hide the list of applications": "Show and hide the list of applications" +"Use the avatar instead of the logo": "Use the avatar instead of the logo" +"You do not have permission to change the settings.": "You do not have permission to change the settings." +"Force this configuration to users": "Force this configuration to users" +"Export the configuration": "Export the configuration" +"Purge the cache": "Purge the cache" +"Show the link to settings": "Show the link to settings" +"The menu is enabled by default for users": "The menu is enabled by default for users" +"Except when the configuration is forced.": "Except when the configuration is forced." +"Apps that should not be displayed in the menu": "Apps that should not be displayed in the menu" +"This feature is only compatible with the big menu display.": "This feature is only compatible with the big menu display." +"The logo is a link to the default app": "The logo is a link to the default app" +"Others": "Others" +"Categories": "Categories" +"Customize sorting": "Customize sorting" +"Order by": "Order by" +"Name": "Name" +"Customed": "Customed" +"Show and hide the list of categories": "Show and hide the list of categories" +"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "This parameters are used when Dark theme or Breeze Dark Theme are enabled." +"Dark mode colors": "Dark mode colors" +"With categories": "With categories" +"Custom categories": "Custom categories" +"Customize application categories": "Customize application categories" +"Reset to default": "Reset to default" +"Applications": "Applications" +"Applications kept in the top menu": "Applications kept in the top menu" +"Applications kept in the top menu but also shown in side menu": "Applications kept in the top menu but also shown in side menu" +"These applications must be selected in the previous option.": "These applications must be selected in the previous option." From 5ad6af0b0d9902f310a44a7f0a0fb2e0f399e4e6 Mon Sep 17 00:00:00 2001 From: deblan Date: Sun, 20 Nov 2022 13:18:23 +0000 Subject: [PATCH 10/16] Translated using Weblate (Russian) Currently translated at 64.8% (59 of 91 strings) Translation: Custom menu/Application Translate-URL: https://translate.codeberg.org/projects/custom-menu/application/ru/ --- src/l10n/fixtures/ru.yaml | 58 +++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/src/l10n/fixtures/ru.yaml b/src/l10n/fixtures/ru.yaml index 40823a0..100660a 100644 --- a/src/l10n/fixtures/ru.yaml +++ b/src/l10n/fixtures/ru.yaml @@ -1,5 +1,5 @@ -"Custom menu": "" -"Enable the custom menu": "" +"Custom menu": "Custom menu" +"Enable the custom menu": "Enable the custom menu" "No": "Нет" "Yes": "Да" "Menu": "Меню" @@ -7,7 +7,7 @@ : 'Используйте сочетание клавиш Ctrl+o, чтобы открыть или скрыть боковое меню. Используйте Tab для навигации.' "Top menu": "Верхнее меню" "Apps that not must be moved in the side menu": "Приложения не перемещаемые в боковое меню" -"If there is no selection then the global configuration is applied.": "" +"If there is no selection then the global configuration is applied.": "If there is no selection then the global configuration is applied." "Experimental": "Экспериментальный" "Save": "Сохранить" "You like this app and you want to support me?": "Вам нравится приложение или вы хотите поддержать его?" @@ -31,10 +31,10 @@ "Loader": "Загрузчик" "Icon": "Иконка" "Same color": "Такой же цвет" -"Opposite color": "" +"Opposite color": "Opposite color" "Transparent": "Прозрачный" -"Opaque": "" -"Opener": "" +"Opaque": "Opaque" +"Opener": "Opener" "Default": "По-умолчанию" "Default (dark)": "По-умолчанию (тёмный)" "Hamburger": "Гамбургер" @@ -44,49 +44,49 @@ "Before the logo": "Перед логотипом" "After the logo": "После логотипа" "Position": "Позиция" -"Show only the opener (hidden logo)": "" -"Do not display the side menu and the opener if there is no application (eg: public pages).": "" +"Show only the opener (hidden logo)": "Show only the opener (hidden logo)" +"Do not display the side menu and the opener if there is no application (eg: public pages).": "Do not display the side menu and the opener if there is no application (eg: public pages)." "Panel": "Панеот" -"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "" +"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Open the menu when the mouse is hover the opener (automatically disabled on touch screens)" "Display the big menu": "Отобразить большое меню" "Display the logo": "Показать лого" "Icons and texts": "Иконки и текст" -"Loader enabled": "" +"Loader enabled": "Loader enabled" "Tips": "Советы" "Always displayed": "Всегда отображается" -"This is the automatic behavior when the menu is always displayed.": "" +"This is the automatic behavior when the menu is always displayed.": "This is the automatic behavior when the menu is always displayed." "Not compatible with touch screens.": "Не совместимо с сенсорными экранами" "Big menu": "Большое меню" -"Live preview": "" +"Live preview": "Live preview" "Open apps in new tab": "Открывать приложения в новой вкладке" -"Use the global setting": "" -"Use my selection": "" +"Use the global setting": "Use the global setting" +"Use my selection": "Use my selection" "Show and hide the list of applications": "Показать или скрыть список приложений" "Use the avatar instead of the logo": "Использовать аватар вместо логотипа" "You do not have permission to change the settings.": "У вас нет разрешения изменять настройки" -"Force this configuration to users": "" +"Force this configuration to users": "Force this configuration to users" "Export the configuration": "Экспортировать конфигурацию" "Purge the cache": "Очистить кэш" -"Show the link to settings": "" -"The menu is enabled by default for users": "" -"Except when the configuration is forced.": "" -"Apps that should not be displayed in the menu": "" -"This feature is only compatible with the big menu display.": "" -"The logo is a link to the default app": "" +"Show the link to settings": "Show the link to settings" +"The menu is enabled by default for users": "The menu is enabled by default for users" +"Except when the configuration is forced.": "Except when the configuration is forced." +"Apps that should not be displayed in the menu": "Apps that should not be displayed in the menu" +"This feature is only compatible with the big menu display.": "This feature is only compatible with the big menu display." +"The logo is a link to the default app": "The logo is a link to the default app" "Others": "Прочие" "Categories": "Категории" -"Customize sorting": "" +"Customize sorting": "Customize sorting" "Order by": "В порядке" "Name": "Название" -"Customed": "" +"Customed": "Customed" "Show and hide the list of categories": "Показать или скрыть список категорий" -"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "" +"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "This parameters are used when Dark theme or Breeze Dark Theme are enabled." "Dark mode colors": "Цвета тёмной темы" "With categories": "С категориями" -"Custom categories": "" -"Customize application categories": "" +"Custom categories": "Custom categories" +"Customize application categories": "Customize application categories" "Reset to default": "Сбросить к значениям по-умолчанию" "Applications": "Приложения" -"Applications kept in the top menu": "" -"Applications kept in the top menu but also shown in side menu": "" -"These applications must be selected in the previous option.": "" +"Applications kept in the top menu": "Applications kept in the top menu" +"Applications kept in the top menu but also shown in side menu": "Applications kept in the top menu but also shown in side menu" +"These applications must be selected in the previous option.": "These applications must be selected in the previous option." From 98d72a1e951610fb09df045dff8ab63193491973 Mon Sep 17 00:00:00 2001 From: nier Date: Fri, 18 Nov 2022 23:15:28 +0000 Subject: [PATCH 11/16] Translated using Weblate (Russian) Currently translated at 64.8% (59 of 91 strings) Translation: Custom menu/Application Translate-URL: https://translate.codeberg.org/projects/custom-menu/application/ru/ --- src/l10n/fixtures/ru.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/l10n/fixtures/ru.yaml b/src/l10n/fixtures/ru.yaml index 100660a..50262cb 100644 --- a/src/l10n/fixtures/ru.yaml +++ b/src/l10n/fixtures/ru.yaml @@ -10,7 +10,7 @@ "If there is no selection then the global configuration is applied.": "If there is no selection then the global configuration is applied." "Experimental": "Экспериментальный" "Save": "Сохранить" -"You like this app and you want to support me?": "Вам нравится приложение или вы хотите поддержать его?" +"You like this app and you want to support me?": "Вам нравится приложение или вы хотите поддержать меня?" "Buy me a coffee ☕": "Купить мне чашку кофе ☕" "Hidden": "Скрыто" "Small": "Маленький" From 887aa7f7f5d33ad5251788e61aa9c69b6cdedc3a Mon Sep 17 00:00:00 2001 From: deblan Date: Sat, 5 Nov 2022 11:36:33 +0000 Subject: [PATCH 12/16] Added translation using Weblate (Dutch) --- src/l10n/fixtures/nl.yaml | 95 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/src/l10n/fixtures/nl.yaml b/src/l10n/fixtures/nl.yaml index ad417e6..e1731e3 100644 --- a/src/l10n/fixtures/nl.yaml +++ b/src/l10n/fixtures/nl.yaml @@ -1,3 +1,4 @@ +<<<<<<< HEAD "Custom menu": "Custom menu" "Enable the custom menu": "Enable the custom menu" "No": "No" @@ -90,3 +91,97 @@ "Applications kept in the top menu": "Applications kept in the top menu" "Applications kept in the top menu but also shown in side menu": "Applications kept in the top menu but also shown in side menu" "These applications must be selected in the previous option.": "These applications must be selected in the previous option." +======= +"Custom menu": "" +"Enable the custom menu": "" +"No": "" +"Yes": "" +"Menu": "" +? 'Use the shortcut Ctrl+o to open and to hide the side menu. Use tab to navigate.' +: '' +"Top menu": "" +"Apps that not must be moved in the side menu": "" +"If there is no selection then the global configuration is applied.": "" +"Experimental": "" +"Save": "" +"You like this app and you want to support me?": "" +"Buy me a coffee ☕": "" +"Hidden": "" +"Small": "" +"Normal": "" +"Big": "" +"Hidden icon": "" +"Small icon": "" +"Normal icon": "" +"Big icon": "" +"Hidden text": "" +"Small text": "" +"Normal text": "" +"Big text": "" +"Colors": "" +"Background color": "" +"Background color of current app": "" +"Text color": "" +"Loader": "" +"Icon": "" +"Same color": "" +"Opposite color": "" +"Transparent": "" +"Opaque": "" +"Opener": "" +"Default": "" +"Default (dark)": "" +"Hamburger": "" +"Hamburger (dark)": "" +"Hamburger 2": "" +"Hamburger 2 (dark)": "" +"Before the logo": "" +"After the logo": "" +"Position": "" +"Show only the opener (hidden logo)": "" +"Do not display the side menu and the opener if there is no application (eg: public pages).": "" +"Panel": "" +"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "" +"Display the big menu": "" +"Display the logo": "" +"Icons and texts": "" +"Loader enabled": "" +"Tips": "" +"Always displayed": "" +"This is the automatic behavior when the menu is always displayed.": "" +"Not compatible with touch screens.": "" +"Big menu": "" +"Live preview": "" +"Open apps in new tab": "" +"Use the global setting": "" +"Use my selection": "" +"Show and hide the list of applications": "" +"Use the avatar instead of the logo": "" +"You do not have permission to change the settings.": "" +"Force this configuration to users": "" +"Export the configuration": "" +"Purge the cache": "" +"Show the link to settings": "" +"The menu is enabled by default for users": "" +"Except when the configuration is forced.": "" +"Apps that should not be displayed in the menu": "" +"This feature is only compatible with the big menu display.": "" +"The logo is a link to the default app": "" +"Others": "" +"Categories": "" +"Customize sorting": "" +"Order by": "" +"Name": "" +"Customed": "" +"Show and hide the list of categories": "" +"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "" +"Dark mode colors": "" +"With categories": "" +"Custom categories": "" +"Customize application categories": "" +"Reset to default": "" +"Applications": "" +"Applications kept in the top menu": "" +"Applications kept in the top menu but also shown in side menu": "" +"These applications must be selected in the previous option.": "" +>>>>>>> 7bbed57 (Added translation using Weblate (Dutch)) From 0f24133b991cdcdc4b140998428364526bfed690 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 20 Nov 2022 14:43:44 +0100 Subject: [PATCH 13/16] fix merge --- src/l10n/fixtures/nl.yaml | 95 --------------------------------------- 1 file changed, 95 deletions(-) diff --git a/src/l10n/fixtures/nl.yaml b/src/l10n/fixtures/nl.yaml index e1731e3..ad417e6 100644 --- a/src/l10n/fixtures/nl.yaml +++ b/src/l10n/fixtures/nl.yaml @@ -1,4 +1,3 @@ -<<<<<<< HEAD "Custom menu": "Custom menu" "Enable the custom menu": "Enable the custom menu" "No": "No" @@ -91,97 +90,3 @@ "Applications kept in the top menu": "Applications kept in the top menu" "Applications kept in the top menu but also shown in side menu": "Applications kept in the top menu but also shown in side menu" "These applications must be selected in the previous option.": "These applications must be selected in the previous option." -======= -"Custom menu": "" -"Enable the custom menu": "" -"No": "" -"Yes": "" -"Menu": "" -? 'Use the shortcut Ctrl+o to open and to hide the side menu. Use tab to navigate.' -: '' -"Top menu": "" -"Apps that not must be moved in the side menu": "" -"If there is no selection then the global configuration is applied.": "" -"Experimental": "" -"Save": "" -"You like this app and you want to support me?": "" -"Buy me a coffee ☕": "" -"Hidden": "" -"Small": "" -"Normal": "" -"Big": "" -"Hidden icon": "" -"Small icon": "" -"Normal icon": "" -"Big icon": "" -"Hidden text": "" -"Small text": "" -"Normal text": "" -"Big text": "" -"Colors": "" -"Background color": "" -"Background color of current app": "" -"Text color": "" -"Loader": "" -"Icon": "" -"Same color": "" -"Opposite color": "" -"Transparent": "" -"Opaque": "" -"Opener": "" -"Default": "" -"Default (dark)": "" -"Hamburger": "" -"Hamburger (dark)": "" -"Hamburger 2": "" -"Hamburger 2 (dark)": "" -"Before the logo": "" -"After the logo": "" -"Position": "" -"Show only the opener (hidden logo)": "" -"Do not display the side menu and the opener if there is no application (eg: public pages).": "" -"Panel": "" -"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "" -"Display the big menu": "" -"Display the logo": "" -"Icons and texts": "" -"Loader enabled": "" -"Tips": "" -"Always displayed": "" -"This is the automatic behavior when the menu is always displayed.": "" -"Not compatible with touch screens.": "" -"Big menu": "" -"Live preview": "" -"Open apps in new tab": "" -"Use the global setting": "" -"Use my selection": "" -"Show and hide the list of applications": "" -"Use the avatar instead of the logo": "" -"You do not have permission to change the settings.": "" -"Force this configuration to users": "" -"Export the configuration": "" -"Purge the cache": "" -"Show the link to settings": "" -"The menu is enabled by default for users": "" -"Except when the configuration is forced.": "" -"Apps that should not be displayed in the menu": "" -"This feature is only compatible with the big menu display.": "" -"The logo is a link to the default app": "" -"Others": "" -"Categories": "" -"Customize sorting": "" -"Order by": "" -"Name": "" -"Customed": "" -"Show and hide the list of categories": "" -"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "" -"Dark mode colors": "" -"With categories": "" -"Custom categories": "" -"Customize application categories": "" -"Reset to default": "" -"Applications": "" -"Applications kept in the top menu": "" -"Applications kept in the top menu but also shown in side menu": "" -"These applications must be selected in the previous option.": "" ->>>>>>> 7bbed57 (Added translation using Weblate (Dutch)) From c3cd78971b81cbe80794349ea9d541fe147994c6 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 20 Nov 2022 14:47:09 +0100 Subject: [PATCH 14/16] update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 96c5b60..0ea1c46 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ ## [Unreleased] ### Added -* add translations (thanks to Pavelb) +* add translations (thanks to Pavelb, nier, Timur, p-bo) * add possibility to define Custom Menu as default app and redirect to the first top menu app (#177) ## 3.3.2 From c63ac1556e57f35aef0f400c66d382c4e7941bac Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 20 Nov 2022 15:04:54 +0100 Subject: [PATCH 15/16] update ci --- .woodpecker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.woodpecker.yml b/.woodpecker.yml index aee34a9..d51f01d 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -12,6 +12,7 @@ pipeline: commands: - make build when: + branch: [master, develop, feature/*] event: [push, pull_request] package: From f61f05c1c9fe3913965dee097b5f74dcb0318cba Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 20 Nov 2022 15:10:50 +0100 Subject: [PATCH 16/16] release v3.4.0 --- CHANGELOG.md | 1 + appinfo/info.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ea1c46..88309a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ## [Unreleased] +## 3.4.0 ### Added * add translations (thanks to Pavelb, nier, Timur, p-bo) * add possibility to define Custom Menu as default app and redirect to the first top menu app (#177) diff --git a/appinfo/info.xml b/appinfo/info.xml index e3e1ea1..1105b43 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -32,7 +32,7 @@ Notice Because I believe in a free and decentralized Internet, [Gitnet](https://gitnet.fr) is **self-hosted at home**. In case of downtime, you can download **Custom Menu** from [here](https://kim.deblan.fr/~side_menu/). ]]> - 3.3.2 + 3.4.0 agpl Simon Vieille SideMenu