Merge branch 'SLE-15-SP3' into merge_SLE_15-SP3

yast · May 20, 2021 · acf5d0b · acf5d0b
2 parents 04b5d5b + ab68801
commit acf5d0b
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ on: [push, pull_request]
 jobs:
   Tests:
     runs-on: ubuntu-latest
-    container: registry.opensuse.org/yast/head/containers/yast-ruby:latest
+    container: registry.opensuse.org/yast/sle-15/sp3/containers/yast-ruby:latest
 
     steps:
 
@@ -33,7 +33,7 @@ jobs:
 
   Rubocop:
     runs-on: ubuntu-latest
-    container: registry.opensuse.org/yast/head/containers/yast-ruby:latest
+    container: registry.opensuse.org/yast/sle-15/sp3/containers/yast-ruby:latest
 
     steps:
 
@@ -45,7 +45,7 @@ jobs:
 
   Package:
     runs-on: ubuntu-latest
-    container: registry.opensuse.org/yast/head/containers/yast-ruby:latest
+    container: registry.opensuse.org/yast/sle-15/sp3/containers/yast-ruby:latest
 
     steps:
 
@@ -57,7 +57,7 @@ jobs:
 
   Yardoc:
     runs-on: ubuntu-latest
-    container: registry.opensuse.org/yast/head/containers/yast-ruby:latest
+    container: registry.opensuse.org/yast/sle-15/sp3/containers/yast-ruby:latest
 
     steps:
 
@@ -71,7 +71,7 @@ jobs:
   # checks into one job avoids that overhead
   Checks:
     runs-on: ubuntu-latest
-    container: registry.opensuse.org/yast/head/containers/yast-ruby:latest
+    container: registry.opensuse.org/yast/sle-15/sp3/containers/yast-ruby:latest
 
     steps:
 

diff --git a/Rakefile b/Rakefile
@@ -18,6 +18,8 @@
 
 require "yast/rake"
 
+Yast::Tasks.submit_to :sle15sp3
+
 Yast::Tasks.configuration do |conf|
   conf.skip_license_check << /\.pdf$/ # binary
   conf.skip_license_check << /\.desktop$/

diff --git a/package/yast2-storage-ng.changes b/package/yast2-storage-ng.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu May 20 08:42:54 UTC 2021 - Knut Anderssen <kanderssen@suse.com>
+
+- Make the 'Change Used Devices' menu item translatable
+  (bsc#1185060).
+- 4.4.3
+
 -------------------------------------------------------------------
 Sun May 16 08:11:46 UTC 2021 - Dirk Müller <dmueller@suse.com>
 

diff --git a/package/yast2-storage-ng.spec b/package/yast2-storage-ng.spec
@@ -16,7 +16,7 @@
 #
 
 Name:           yast2-storage-ng
-Version:        4.4.2
+Version:        4.4.3
 Release:        0
 Summary:        YaST2 - Storage Configuration
 License:        GPL-2.0-only OR GPL-3.0-only

diff --git a/src/lib/y2partitioner/widgets/menus/modify.rb b/src/lib/y2partitioner/widgets/menus/modify.rb
@@ -68,7 +68,7 @@ def items
             Item("---"),
             Item(Id(:menu_resize), _("&Resize...")),
             Item(Id(:menu_move), _("&Move...")),
-            Item(Id(:menu_change_devs), "Change &Used Devices..."),
+            Item(Id(:menu_change_devs), _("Change &Used Devices...")),
             Item("---"),
             Item(Id(:menu_create_ptable), _("Create New &Partition Table...")),
             Item(Id(:menu_clone_ptable), _("&Clone Partitions to Another Device..."))