From 9da540a97c03ad0504a405173a04d3782bff1078 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Pi=C4=8Dman?= <karel.picman@kontron.com>
Date: Tue, 6 Dec 2022 14:39:57 +0100
Subject: [PATCH] Settings

---
 .github/workflows/rubyonrails.yml          | 4 ++--
 CHANGELOG.md                               | 3 +++
 README.md                                  | 6 +++---
 app/views/settings/_dmsf_settings.html.erb | 2 +-
 config/locales/en.yml                      | 4 ++--
 init.rb                                    | 4 ++--
 6 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/rubyonrails.yml b/.github/workflows/rubyonrails.yml
index 1a844e39..e928c08b 100644
--- a/.github/workflows/rubyonrails.yml
+++ b/.github/workflows/rubyonrails.yml
@@ -21,9 +21,9 @@
 name: "GitHub CI"
 on:
   push:
-    branches: ["master"]
+    branches: ["devel"]
   pull_request:
-    branches: ["master"]
+    branches: ["devel"]
 jobs:
   plugin_tests:
     strategy:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 71f67bce..4e5e7e39 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
 Changelog for Redmine DMSF
 ==========================
 
+3.0.8 *????-??-??*
+------------------
+
 3.0.7 *2022-11-01*
 ------------------
 
diff --git a/README.md b/README.md
index 00f425fa..20c54129 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
-Redmine DMSF Plugin 3.0.7
-========================= 
+Redmine DMSF Plugin 3.0.8 devel
+=============================== 
 
-[![GitHub CI](https://github.com/danmunn/redmine_dmsf/actions/workflows/rubyonrails.yml/badge.svg?branch=master)](https://github.com/danmunn/redmine_dmsf/actions/workflows/rubyonrails.yml)
+[![GitHub CI](https://github.com/danmunn/redmine_dmsf/actions/workflows/rubyonrails.yml/badge.svg?branch=devel)](https://github.com/danmunn/redmine_dmsf/actions/workflows/rubyonrails.yml)
 [![Support Ukraine Badge](https://bit.ly/support-ukraine-now)](https://github.com/support-ukraine/support-ukraine)
 
 Redmine DMSF is Document Management System Features plugin for Redmine issue tracking system; It is aimed to replace current Redmine's Documents module.
diff --git a/app/views/settings/_dmsf_settings.html.erb b/app/views/settings/_dmsf_settings.html.erb
index ee64a929..bcbff24d 100644
--- a/app/views/settings/_dmsf_settings.html.erb
+++ b/app/views/settings/_dmsf_settings.html.erb
@@ -147,7 +147,7 @@
   <%= check_box_tag 'settings[dmsf_projects_as_subfolders]', true, @settings['dmsf_projects_as_subfolders'] %>
   <em class="info">
     <%= l(:note_dmsf_projects_as_subfolders) %><br/>
-    <%= l(:label_default) %>: <%= l(:general_text_Yes) %>
+    <%= l(:label_default) %>: <%= l(:general_text_No) %>
   </em>
 </p>
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index adb46450..9120d10d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -457,8 +457,8 @@ en:
   label_column_version: Version
   label_column_workflow: Workflow
   label_column_author: Author
-  label_column_description: Beschreibung
-  label_column_comment: Kommentar
+  label_column_description: Description
+  label_column_comment: Comment
 
   label_dmsf_global_menu_disabled: Global DMS menu disabled
   note_dmsf_global_menu_disabled: If yes, DMS menu item is not present in the top menu.
diff --git a/init.rb b/init.rb
index a0d45489..96b90203 100644
--- a/init.rb
+++ b/init.rb
@@ -27,7 +27,7 @@ Redmine::Plugin.register :redmine_dmsf do
   author_url 'https://github.com/danmunn/redmine_dmsf/graphs/contributors'
   author 'Vít Jonáš / Daniel Munn / Karel Pičman'
   description 'Document Management System Features'
-  version '3.0.7'
+  version '3.0.8 devel'
   
   requires_redmine version_or_higher: '5.0.0'
 
@@ -57,7 +57,7 @@ Redmine::Plugin.register :redmine_dmsf do
               'only_approval_zero_minor_version' => '0',
               'dmsf_max_notification_receivers_info' => 10,
               'office_bin' => 'libreoffice',
-              'dmsf_global_menu_disabled' => 0,
+              'dmsf_global_menu_disabled' => nil,
               'dmsf_default_query' => nil
             }
 end