diff --git a/weasis-acquire/weasis-acquire-explorer/src/main/java/org/weasis/acquire/explorer/gui/central/meta/panel/AnatomicRegionView.java b/weasis-acquire/weasis-acquire-explorer/src/main/java/org/weasis/acquire/explorer/gui/central/meta/panel/AnatomicRegionView.java
index a8a21c9b1..1023f7980 100644
--- a/weasis-acquire/weasis-acquire-explorer/src/main/java/org/weasis/acquire/explorer/gui/central/meta/panel/AnatomicRegionView.java
+++ b/weasis-acquire/weasis-acquire-explorer/src/main/java/org/weasis/acquire/explorer/gui/central/meta/panel/AnatomicRegionView.java
@@ -85,7 +85,7 @@ public AnatomicRegionView(AnatomicRegion region, boolean selectSeries) {
   }
 
   void jbInit() {
-    setLayout(new MigLayout("wrap 2", "[right][grow]", "[]10[]10[]20[]"));
+    setLayout(new MigLayout("wrap 2", "[right][grow]", "[]10[]10[]20[]")); // NON-NLS
 
     setBorder(GuiUtils.getEmptyBorder(10, 15, 10, 15));
 
@@ -122,18 +122,18 @@ void jbInit() {
     ratioGroup.add(radioButtonSeries);
     ratioGroup.add(radioButtonImage);
 
-    add(new JLabel("Category" + StringUtil.COLON), "right");
-    add(comboBox1, "growx");
+    add(new JLabel("Category" + StringUtil.COLON), "right"); // NON-NLS
+    add(comboBox1, "growx"); // NON-NLS
 
-    add(new JLabel("Region" + StringUtil.COLON), "right");
-    add(comboBox2, "growx 500");
+    add(new JLabel("Region" + StringUtil.COLON), "right"); // NON-NLS
+    add(comboBox2, "growx 500"); // NON-NLS
 
     List<Object> list = Stream.of(AnatomicModifier.values()).collect(Collectors.toList());
     modifierGroup.setModel(list, false, false);
-    modifiersDropdown.setToolTipText("Select modifiers");
-    add(modifiersDropdown, "cell 1 2, span");
+    modifiersDropdown.setToolTipText("Select modifiers"); // NON-NLS
+    add(modifiersDropdown, "cell 1 2, span"); // NON-NLS
 
-    add(lblApplyTo, "span, split 3, right, gaptop 20");
+    add(lblApplyTo, "span, split 3, right, gaptop 20"); // NON-NLS
     add(radioButtonSeries);
     add(radioButtonImage);
   }
diff --git a/weasis-acquire/weasis-acquire-explorer/src/main/java/org/weasis/acquire/explorer/gui/dialog/AcquirePublishDialog.java b/weasis-acquire/weasis-acquire-explorer/src/main/java/org/weasis/acquire/explorer/gui/dialog/AcquirePublishDialog.java
index df8c0207a..23cdd4dd9 100755
--- a/weasis-acquire/weasis-acquire-explorer/src/main/java/org/weasis/acquire/explorer/gui/dialog/AcquirePublishDialog.java
+++ b/weasis-acquire/weasis-acquire-explorer/src/main/java/org/weasis/acquire/explorer/gui/dialog/AcquirePublishDialog.java
@@ -142,23 +142,24 @@ public void windowClosing(WindowEvent we) {
   }
 
   private JPanel initContent() {
-    JPanel contentPane = new JPanel(new MigLayout("fill, insets 10", "[grow]", "[][][grow][]"));
+    JPanel contentPane =
+        new JPanel(new MigLayout("fill, insets 10", "[grow]", "[][][grow][]")); // NON-NLS
 
     JLabel questionLabel = new JLabel(Messages.getString("AcquirePublishDialog.select_pub"));
     questionLabel.setFont(FontItem.DEFAULT_SEMIBOLD.getFont());
 
-    contentPane.add(questionLabel, "wrap");
+    contentPane.add(questionLabel, "wrap"); // NON-NLS
     publishTree = new PublishTree();
     publishTree.addTreeCheckingListener(
         evt -> {
           resolutionCombo.setEnabled(!getOversizedSelected(publishTree).isEmpty());
         });
-    contentPane.add(publishTree, "grow, wrap");
+    contentPane.add(publishTree, "grow, wrap"); // NON-NLS
 
     contentPane.add(
         new JLabel(
             Messages.getString("AcquirePublishDialog.resolution") + StringUtil.COLON_AND_SPACE),
-        "split 2, span");
+        "split 2, span"); // NON-NLS
     resolutionCombo = new JComboBox<>(Resolution.values());
     Preferences prefs =
         BundlePreferences.getDefaultPreferences(AppProperties.getBundleContext(this.getClass()));
@@ -168,15 +169,15 @@ private JPanel initContent() {
           Resolution.getInstance(p.get(P_LAST_RESOLUTION, Resolution.ORIGINAL.name())));
     }
     resolutionCombo.setEnabled(false);
-    contentPane.add(resolutionCombo, "wrap");
+    contentPane.add(resolutionCombo, "wrap"); // NON-NLS
 
     JLabel lblDestination =
         new JLabel(
             Messages.getString("AcquirePublishDialog.lblDestination.text") + StringUtil.COLON);
     AbstractDicomNode.addTooltipToComboList(comboNode);
     loadDicomNodes();
-    contentPane.add(lblDestination, "split 2, span");
-    contentPane.add(comboNode, " wrap");
+    contentPane.add(lblDestination, "split 2, span"); // NON-NLS
+    contentPane.add(comboNode, " wrap"); // NON-NLS
 
     publishButton = new JButton(Messages.getString("AcquirePublishDialog.publish"));
     publishButton.addActionListener(e -> publishAction());
@@ -188,9 +189,9 @@ private JPanel initContent() {
     progressBar = new JProgressBar();
     progressBar.setStringPainted(true);
     progressBar.setVisible(false);
-    contentPane.add(progressBar, "split 3, span, growx, gaptop 20");
+    contentPane.add(progressBar, "split 3, span, growx, gaptop 20"); // NON-NLS
     contentPane.add(publishButton);
-    contentPane.add(cancelButton, "wrap");
+    contentPane.add(cancelButton, "wrap"); // NON-NLS
     return contentPane;
   }
 
diff --git a/weasis-base/weasis-base-ui/src/main/java/org/weasis/base/ui/gui/WeasisWin.java b/weasis-base/weasis-base-ui/src/main/java/org/weasis/base/ui/gui/WeasisWin.java
index 37f00e96b..995f6ae80 100755
--- a/weasis-base/weasis-base-ui/src/main/java/org/weasis/base/ui/gui/WeasisWin.java
+++ b/weasis-base/weasis-base-ui/src/main/java/org/weasis/base/ui/gui/WeasisWin.java
@@ -1041,7 +1041,7 @@ public void popupMenuWillBecomeVisible() {
     menuFile.add(exportMenu);
 
     DynamicMenu launcherMenu =
-        new DynamicMenu("Launcher") {
+        new DynamicMenu(Messages.getString("launcher")) {
 
           @Override
           public void popupMenuWillBecomeVisible() {
diff --git a/weasis-base/weasis-base-ui/src/main/java/org/weasis/base/ui/messages.properties b/weasis-base/weasis-base-ui/src/main/java/org/weasis/base/ui/messages.properties
index 1f127a94a..ee2515bd7 100755
--- a/weasis-base/weasis-base-ui/src/main/java/org/weasis/base/ui/messages.properties
+++ b/weasis-base/weasis-base-ui/src/main/java/org/weasis/base/ui/messages.properties
@@ -31,3 +31,4 @@ open.logging.folder=Open the logging folder
 
 LicencesDialog.title=Plugin licenses
 LicencesDialog.no.licence=No license found
+launcher=Launcher
diff --git a/weasis-core/src/main/java/org/weasis/core/api/media/data/FileCache.java b/weasis-core/src/main/java/org/weasis/core/api/media/data/FileCache.java
index 15e7429ed..667a19d42 100755
--- a/weasis-core/src/main/java/org/weasis/core/api/media/data/FileCache.java
+++ b/weasis-core/src/main/java/org/weasis/core/api/media/data/FileCache.java
@@ -31,7 +31,7 @@ public FileCache(MediaReader reader) {
   }
 
   public boolean isLocalFile() {
-    return reader.getUri().getScheme().startsWith("file");
+    return reader.getUri().getScheme().startsWith("file"); // NON-NLS
   }
 
   public boolean isElementInMemory() {
diff --git a/weasis-core/src/main/java/org/weasis/core/api/service/BundleTools.java b/weasis-core/src/main/java/org/weasis/core/api/service/BundleTools.java
index bfd0c6ad7..d621d778e 100755
--- a/weasis-core/src/main/java/org/weasis/core/api/service/BundleTools.java
+++ b/weasis-core/src/main/java/org/weasis/core/api/service/BundleTools.java
@@ -136,7 +136,7 @@ private static void registerToolBar(Insertable instance, SeriesViewerUI ui) {
     List<Toolbar> toolBars = ui.getToolBars();
     if (instance instanceof Toolbar bar && !toolBars.contains(instance)) {
       toolBars.add(bar);
-      if (ui.clazz.getPackageName().contains("dicom")) {
+      if (ui.clazz.getPackageName().contains("dicom")) { // NON-NLS
         notifyDicomModel(ObservableEvent.BasicAction.UPDATE_TOOLBARS, ui);
       } else {
         notifyDefaultDataModel(ObservableEvent.BasicAction.UPDATE_TOOLBARS, ui);
diff --git a/weasis-core/src/main/java/org/weasis/core/ui/launcher/ConfigurationDialog.java b/weasis-core/src/main/java/org/weasis/core/ui/launcher/ConfigurationDialog.java
index d1d906e4d..940adc0f1 100644
--- a/weasis-core/src/main/java/org/weasis/core/ui/launcher/ConfigurationDialog.java
+++ b/weasis-core/src/main/java/org/weasis/core/ui/launcher/ConfigurationDialog.java
@@ -39,7 +39,7 @@ public class ConfigurationDialog extends JDialog {
 
   public ConfigurationDialog(Window parent, Launcher launcher, Launcher.Type type) {
     super(parent, Messages.getString("launcher.type"), ModalityType.APPLICATION_MODAL);
-    setLayout(new MigLayout("insets 10lp 15lp 10lp 15lp", "[][grow]", "[][]"));
+    setLayout(new MigLayout("insets 10lp 15lp 10lp 15lp", "[][grow]", "[][]")); // NON-NLS
 
     ButtonGroup group = new ButtonGroup();
     group.add(uriRadioButton);
@@ -49,43 +49,48 @@ public ConfigurationDialog(Window parent, Launcher launcher, Launcher.Type type)
     this.launcher = launcher;
     initialize(launcher);
 
-    add(uriRadioButton, "cell 0 0");
-    add(appRadioButton, "cell 1 0");
+    add(uriRadioButton, "cell 0 0"); // NON-NLS
+    add(appRadioButton, "cell 1 0"); // NON-NLS
 
     cardPanel = new JPanel(new CardLayout());
     cardPanel.setBorder(BorderFactory.createTitledBorder(Messages.getString("configuration")));
 
     JPanel uriPanel = new JPanel(new MigLayout("", "[][grow]", "[]")); // NON-NLS
-    uriPanel.add(new JLabel(Messages.getString("uri") + StringUtil.COLON), "cell 0 0");
-    uriPanel.add(uriField, "cell 1 0, growx");
+    uriPanel.add(new JLabel(Messages.getString("uri") + StringUtil.COLON), "cell 0 0"); // NON-NLS
+    uriPanel.add(uriField, "cell 1 0, growx"); // NON-NLS
 
     JPanel appPanel = new JPanel(new MigLayout("", "[][grow]", "[][][][][]")); // NON-NLS
-    appPanel.add(new JLabel(Messages.getString("binary.path") + StringUtil.COLON), "cell 0 0");
-    appPanel.add(binaryPathField, "cell 1 0, growx");
+    appPanel.add(
+        new JLabel(Messages.getString("binary.path") + StringUtil.COLON), "cell 0 0"); // NON-NLS
+    appPanel.add(binaryPathField, "cell 1 0, growx"); // NON-NLS
 
-    appPanel.add(new JLabel(Messages.getString("working.dir") + StringUtil.COLON), "cell 0 1");
-    appPanel.add(workingDirectoryField, "cell 1 1, growx");
+    appPanel.add(
+        new JLabel(Messages.getString("working.dir") + StringUtil.COLON), "cell 0 1"); // NON-NLS
+    appPanel.add(workingDirectoryField, "cell 1 1, growx"); // NON-NLS
 
-    appPanel.add(new JLabel(Messages.getString("parameters") + StringUtil.COLON), "cell 0 2");
-    appPanel.add(new JScrollPane(parametersArea), "cell 1 2, growx");
+    appPanel.add(
+        new JLabel(Messages.getString("parameters") + StringUtil.COLON), "cell 0 2"); // NON-NLS
+    appPanel.add(new JScrollPane(parametersArea), "cell 1 2, growx"); // NON-NLS
 
-    appPanel.add(new JLabel(Messages.getString("env.variables") + StringUtil.COLON), "cell 0 3");
-    appPanel.add(new JScrollPane(environmentVariablesArea), "cell 1 3, growx");
+    appPanel.add(
+        new JLabel(Messages.getString("env.variables") + StringUtil.COLON), "cell 0 3"); // NON-NLS
+    appPanel.add(new JScrollPane(environmentVariablesArea), "cell 1 3, growx"); // NON-NLS
 
-    appPanel.add(new JLabel(Messages.getString("compatibility") + StringUtil.COLON), "cell 0 4");
-    appPanel.add(compatibilityField, "cell 1 4, growx");
+    appPanel.add(
+        new JLabel(Messages.getString("compatibility") + StringUtil.COLON), "cell 0 4"); // NON-NLS
+    appPanel.add(compatibilityField, "cell 1 4, growx"); // NON-NLS
 
     cardPanel.add(uriPanel, uriRadioButton.getText());
     cardPanel.add(appPanel, appRadioButton.getText());
 
-    add(cardPanel, "cell 0 1 2 1, grow");
+    add(cardPanel, "cell 0 1 2 1, grow"); // NON-NLS
 
     uriRadioButton.addActionListener(_ -> showCard());
     appRadioButton.addActionListener(_ -> showCard());
 
     JButton saveButton = new JButton(Messages.getString("save"));
     saveButton.addActionListener(_ -> saveConfiguration());
-    add(saveButton, "cell 1 3, split 2, align right, gapright 15, gaptop 15");
+    add(saveButton, "cell 1 3, split 2, align right, gapright 15, gaptop 15"); // NON-NLS
     JButton cancelButton = new JButton(Messages.getString("cancel"));
     cancelButton.addActionListener(_ -> dispose());
     add(cancelButton);
@@ -151,7 +156,7 @@ private ApplicationConfiguration setApplicationConfiguration(Configuration confi
     appConfig.setWorkingDirectory(workingDirectoryField.getText());
     appConfig.setParameters(
         new ArrayList<>(
-            Arrays.stream(parametersArea.getText().split("\\n"))
+            Arrays.stream(parametersArea.getText().split("\\n")) // NON-NLS
                 .filter(StringUtil::hasText)
                 .toList()));
     appConfig.setEnvironmentVariables(
diff --git a/weasis-core/src/main/java/org/weasis/core/ui/launcher/Launcher.java b/weasis-core/src/main/java/org/weasis/core/ui/launcher/Launcher.java
index d84396f74..8f828e8ca 100644
--- a/weasis-core/src/main/java/org/weasis/core/ui/launcher/Launcher.java
+++ b/weasis-core/src/main/java/org/weasis/core/ui/launcher/Launcher.java
@@ -409,7 +409,8 @@ public void launch(ImageViewerEventManager<?> eventManager) {
         return;
       }
       boolean isMac = compatibility == Compatibility.MAC;
-      List<String> command = new ArrayList<>(Arrays.asList(binaryPath.trim().split("\\s+")));
+      List<String> command =
+          new ArrayList<>(Arrays.asList(binaryPath.trim().split("\\s+"))); // NON-NLS
       if (!isMac && parameters != null && !parameters.isEmpty()) {
         for (String param : parameters) {
           command.add(resolvePlaceholders(param, eventManager));
@@ -584,7 +585,7 @@ static void saveLaunchers(Type type) {
       Set<SeriesViewerUI> uiSet =
           viewerPlugins.stream().map(ViewerPlugin::getSeriesViewerUI).collect(Collectors.toSet());
       for (SeriesViewerUI ui : uiSet) {
-        if (ui.clazz.getPackageName().contains("dicom")) {
+        if (ui.clazz.getPackageName().contains("dicom")) { // NON-NLS
           BundleTools.notifyDicomModel(ObservableEvent.BasicAction.UPDATE_TOOLBARS, ui);
         } else {
           BundleTools.notifyDefaultDataModel(ObservableEvent.BasicAction.UPDATE_TOOLBARS, ui);
diff --git a/weasis-core/src/main/java/org/weasis/core/ui/launcher/LauncherDialog.java b/weasis-core/src/main/java/org/weasis/core/ui/launcher/LauncherDialog.java
index 6e0d6a16c..de0c78a82 100644
--- a/weasis-core/src/main/java/org/weasis/core/ui/launcher/LauncherDialog.java
+++ b/weasis-core/src/main/java/org/weasis/core/ui/launcher/LauncherDialog.java
@@ -32,7 +32,8 @@ public class LauncherDialog extends JDialog {
   public LauncherDialog(
       Window parent, Launcher.Type type, Launcher launcher, JComboBox<Launcher> nodeComboBox) {
     super(parent, type.toString(), ModalityType.APPLICATION_MODAL);
-    setLayout(new MigLayout("insets 10lp 15lp 10lp 15lp, wrap 2", "[][grow]", "[][][][]"));
+    setLayout(
+        new MigLayout("insets 10lp 15lp 10lp 15lp, wrap 2", "[][grow]", "[][][][]")); // NON-NLS
     this.type = Objects.requireNonNull(type);
     this.nodesComboBox = nodeComboBox;
     if (launcher == null) {
@@ -46,23 +47,23 @@ public LauncherDialog(
       buttonCheckBox.setSelected(launcher.isButton());
     }
 
-    add(new JLabel(Messages.getString("name") + StringUtil.COLON), "align right");
-    add(nameField, "growx");
+    add(new JLabel(Messages.getString("name") + StringUtil.COLON), "align right"); // NON-NLS
+    add(nameField, "growx"); // NON-NLS
 
-    add(new JLabel(Messages.getString("icon.path") + StringUtil.COLON), "align right");
-    add(iconNameField, "growx");
+    add(new JLabel(Messages.getString("icon.path") + StringUtil.COLON), "align right"); // NON-NLS
+    add(iconNameField, "growx"); // NON-NLS
 
-    add(enableCheckBox, "span, split 3");
-    add(buttonCheckBox, "growx");
+    add(enableCheckBox, "span, split 3"); // NON-NLS
+    add(buttonCheckBox, "growx"); // NON-NLS
 
     JButton configurationButton = new JButton(Messages.getString("configure"));
     configurationButton.addActionListener(
         _ -> new ConfigurationDialog(LauncherDialog.this, this.launcher, type).setVisible(true));
-    add(configurationButton, "align right");
+    add(configurationButton, "align right"); // NON-NLS
 
     JButton saveButton = new JButton(Messages.getString("save"));
     saveButton.addActionListener(_ -> saveLauncher());
-    add(saveButton, "cell 1 4, split 2, align right, gapright 15, gaptop 15");
+    add(saveButton, "cell 1 4, split 2, align right, gapright 15, gaptop 15"); // NON-NLS
     JButton cancelButton = new JButton(Messages.getString("cancel"));
     cancelButton.addActionListener(_ -> dispose());
     add(cancelButton);
diff --git a/weasis-core/src/main/java/org/weasis/core/ui/pref/ThemeSetting.java b/weasis-core/src/main/java/org/weasis/core/ui/pref/ThemeSetting.java
index 57781acf0..0f55a1d91 100755
--- a/weasis-core/src/main/java/org/weasis/core/ui/pref/ThemeSetting.java
+++ b/weasis-core/src/main/java/org/weasis/core/ui/pref/ThemeSetting.java
@@ -193,8 +193,8 @@ private static float parseScaleFactor(String s) {
     if (s == null) return -1;
 
     float units = 1;
-    if (s.endsWith("x")) s = s.substring(0, s.length() - 1);
-    else if (s.endsWith("dpi")) {
+    if (s.endsWith("x")) s = s.substring(0, s.length() - 1); // NON-NLS
+    else if (s.endsWith("dpi")) { // NON-NLS
       units = 96;
       s = s.substring(0, s.length() - 3);
     } else if (s.endsWith("%")) {
diff --git a/weasis-core/src/main/java/org/weasis/core/ui/pref/ViewSetting.java b/weasis-core/src/main/java/org/weasis/core/ui/pref/ViewSetting.java
index 9c805e100..c95e5cfbc 100755
--- a/weasis-core/src/main/java/org/weasis/core/ui/pref/ViewSetting.java
+++ b/weasis-core/src/main/java/org/weasis/core/ui/pref/ViewSetting.java
@@ -171,7 +171,7 @@ static String buildScreenItem(Monitor monitor) {
     Rectangle b = monitor.getBounds();
     buf.append(".");
     buf.append(b.width);
-    buf.append("x");
+    buf.append("x"); // NON-NLS
     buf.append(b.height);
     buf.append(".pitch");
     return buf.toString();
diff --git a/weasis-dicom/weasis-dicom-3d/viewer3d/src/main/java/org/weasis/dicom/viewer3d/vr/ShaderManager.java b/weasis-dicom/weasis-dicom-3d/viewer3d/src/main/java/org/weasis/dicom/viewer3d/vr/ShaderManager.java
index bfca7b7b2..12c74ab57 100755
--- a/weasis-dicom/weasis-dicom-3d/viewer3d/src/main/java/org/weasis/dicom/viewer3d/vr/ShaderManager.java
+++ b/weasis-dicom/weasis-dicom-3d/viewer3d/src/main/java/org/weasis/dicom/viewer3d/vr/ShaderManager.java
@@ -45,7 +45,7 @@ public static String getCode(String name) {
 
   public static int readSource(String name, final StringBuilder result, int lineno)
       throws IOException {
-    InputStream stream = ShaderManager.class.getResourceAsStream("/shader/" + name);
+    InputStream stream = ShaderManager.class.getResourceAsStream("/shader/" + name); // NON-NLS
     if (stream == null) {
       throw new IllegalStateException("Cannot load " + name);
     }
@@ -54,7 +54,7 @@ public static int readSource(String name, final StringBuilder result, int lineno
       String line;
       while ((line = reader.readLine()) != null) {
         lineno++;
-        if (line.startsWith("#include ")) {
+        if (line.startsWith("#include ")) { // NON-NLS
           String file = line.substring(9).trim();
           if (file.startsWith("\"") && file.endsWith("\"")) {
             file = file.substring(1, file.length() - 1);
diff --git a/weasis-dicom/weasis-dicom-explorer/src/main/java/org/weasis/dicom/explorer/DicomExplorer.java b/weasis-dicom/weasis-dicom-explorer/src/main/java/org/weasis/dicom/explorer/DicomExplorer.java
index 6a90aeb7b..9358aab6f 100755
--- a/weasis-dicom/weasis-dicom-explorer/src/main/java/org/weasis/dicom/explorer/DicomExplorer.java
+++ b/weasis-dicom/weasis-dicom-explorer/src/main/java/org/weasis/dicom/explorer/DicomExplorer.java
@@ -659,8 +659,8 @@ List<StudyPane> getStudyPaneList() {
     private void refreshLayout() {
       this.setLayout(
           verticalLayout
-              ? new MigLayout("fillx, flowy, insets 0", "[fill]")
-              : new MigLayout("fillx, flowx, insets 0", "[fill]"));
+              ? new MigLayout("fillx, flowy, insets 0", "[fill]") // NON-NLS
+              : new MigLayout("fillx, flowx, insets 0", "[fill]")); // NON-NLS
       List<StudyPane> studies = getStudyPaneList();
       super.removeAll();
       for (StudyPane studyPane : studies) {
@@ -714,7 +714,7 @@ public StudyPane(MediaSeriesGroup dicomStudy) {
       this.setBorder(
           BorderFactory.createCompoundBorder(GuiUtils.getEmptyBorder(0, 3, 0, 3), title));
       this.setFocusable(false);
-      this.add(sub, "shrinky 100");
+      this.add(sub, "shrinky 100"); // NON-NLS
       this.addComponentListener(
           new ComponentAdapter() {
             @Override
@@ -805,7 +805,7 @@ class SeriesPane extends JPanel {
 
     public SeriesPane(MediaSeriesGroup sequence) {
       this.sequence = Objects.requireNonNull(sequence);
-      this.setLayout(new MigLayout("wrap 1", "[center]"));
+      this.setLayout(new MigLayout("wrap 1", "[center]")); // NON-NLS
       this.setBackground(FlatUIUtils.getUIColor(SeriesSelectionModel.BACKGROUND, Color.LIGHT_GRAY));
       int thumbnailSize =
           GuiUtils.getUICore()
diff --git a/weasis-dicom/weasis-dicom-explorer/src/main/java/org/weasis/dicom/explorer/DicomFieldsView.java b/weasis-dicom/weasis-dicom-explorer/src/main/java/org/weasis/dicom/explorer/DicomFieldsView.java
index 85d96134a..bc97bf0e5 100755
--- a/weasis-dicom/weasis-dicom-explorer/src/main/java/org/weasis/dicom/explorer/DicomFieldsView.java
+++ b/weasis-dicom/weasis-dicom-explorer/src/main/java/org/weasis/dicom/explorer/DicomFieldsView.java
@@ -391,11 +391,12 @@ private void writeItems(DicomData dicomData, TagReadable group, StyledDocument d
             Object val = TagUtil.getTagValue(tag, group, currentMedia);
             if (val != null) {
               exist = true;
-              doc.insertString(doc.getLength(), tag.getDisplayedName(), doc.getStyle("normal"));
+              doc.insertString(
+                  doc.getLength(), tag.getDisplayedName(), doc.getStyle("normal")); // NON-NLS
               doc.insertString(
                   doc.getLength(),
                   StringUtil.COLON_AND_SPACE + tag.getFormattedTagValue(val, null) + "\n",
-                  doc.getStyle("bold"));
+                  doc.getStyle("bold")); // NON-NLS
               break;
             }
           } catch (BadLocationException e) {
@@ -408,7 +409,7 @@ private void writeItems(DicomData dicomData, TagReadable group, StyledDocument d
       try {
         String formatTitle =
             insertTitle < 3 ? dicomData.title + "\n" : "\n" + dicomData.title + "\n";
-        doc.insertString(insertTitle, formatTitle, doc.getStyle("h3"));
+        doc.insertString(insertTitle, formatTitle, doc.getStyle("h3")); // NON-NLS
       } catch (BadLocationException e) {
         LOGGER.error("Writing text issue", e);
       }
diff --git a/weasis-dicom/weasis-dicom-qr/src/main/java/org/weasis/dicom/qr/DicomQrView.java b/weasis-dicom/weasis-dicom-qr/src/main/java/org/weasis/dicom/qr/DicomQrView.java
index 0a7a482e3..761f8ebfc 100755
--- a/weasis-dicom/weasis-dicom-qr/src/main/java/org/weasis/dicom/qr/DicomQrView.java
+++ b/weasis-dicom/weasis-dicom-qr/src/main/java/org/weasis/dicom/qr/DicomQrView.java
@@ -756,7 +756,7 @@ private void dicomQuery() {
                   });
             }
           };
-      process = new QueryProcess(runnable, "DICOM C-FIND", running);
+      process = new QueryProcess(runnable, "DICOM C-FIND", running); // NON-NLS
       process.start();
     } else if (selectedItem instanceof final DicomWebNode node) {
       AuthMethod auth = AuthenticationPersistence.getAuthMethod(node.getAuthMethodUid());
@@ -806,7 +806,7 @@ private void dicomQuery() {
               LOGGER.error("", e);
             }
           };
-      process = new QueryProcess(runnable, "QIDO-RS", running);
+      process = new QueryProcess(runnable, "QIDO-RS", running); // NON-NLS
       process.start();
     }
   }
diff --git a/weasis-launcher/src/main/java/org/weasis/launcher/FlatWeasisTheme.java b/weasis-launcher/src/main/java/org/weasis/launcher/FlatWeasisTheme.java
index 1e7b72faa..68496d399 100755
--- a/weasis-launcher/src/main/java/org/weasis/launcher/FlatWeasisTheme.java
+++ b/weasis-launcher/src/main/java/org/weasis/launcher/FlatWeasisTheme.java
@@ -13,6 +13,7 @@
 import com.formdev.flatlaf.IntelliJTheme.ThemeLaf;
 import com.formdev.flatlaf.util.LoggingFacade;
 import java.io.IOException;
+import java.util.Objects;
 
 public class FlatWeasisTheme extends ThemeLaf {
   public static boolean setup() {
@@ -31,7 +32,8 @@ public String getName() {
   static IntelliJTheme loadTheme(String name) {
     try {
       return new IntelliJTheme(
-          FlatWeasisTheme.class.getResourceAsStream("/org/weasis/theme/" + name));
+          Objects.requireNonNull(
+              FlatWeasisTheme.class.getResourceAsStream("/org/weasis/theme/" + name))); // NON-NLS
     } catch (IOException var3) {
       String msg = "FlatLaf: Failed to load Weasis theme"; // NON-NLS
       LoggingFacade.INSTANCE.logSevere(msg, var3);
diff --git a/weasis-launcher/src/main/java/org/weasis/launcher/WeasisLauncher.java b/weasis-launcher/src/main/java/org/weasis/launcher/WeasisLauncher.java
index ab4e4656d..4d7d8be20 100755
--- a/weasis-launcher/src/main/java/org/weasis/launcher/WeasisLauncher.java
+++ b/weasis-launcher/src/main/java/org/weasis/launcher/WeasisLauncher.java
@@ -152,7 +152,7 @@ public final void launch(Type type) throws Exception {
                 JOptionPane.showOptionDialog(
                     mainFrame.getWindow(),
                     String.format(
-                        "%s\n\n%s",
+                        "%s\n\n%s", // NON-NLS
                         Messages.getString("WeasisLauncher.update_min"),
                         Messages.getString("WeasisLauncher.continue_local"),
                         appName,
@@ -1186,7 +1186,7 @@ private List<Path> listOldFolders(Path dir) throws IOException {
           .filter(
               path ->
                   Files.isDirectory(path)
-                      && path.getFileName().toString().startsWith("cache-")
+                      && path.getFileName().toString().startsWith("cache-") // NON-NLS
                       && isOlderThan(path, days))
           .toList();
     }
diff --git a/weasis-launcher/src/main/java/org/weasis/pref/ConfigData.java b/weasis-launcher/src/main/java/org/weasis/pref/ConfigData.java
index e7436a1e5..d3d1e4357 100755
--- a/weasis-launcher/src/main/java/org/weasis/pref/ConfigData.java
+++ b/weasis-launcher/src/main/java/org/weasis/pref/ConfigData.java
@@ -556,7 +556,7 @@ private void addConfigParam(Map<String, List<String>> configParams, String name,
   }
 
   private URI adaptConfigServiceURI(URI configServiceUri) throws URISyntaxException {
-    List<String> paramsToOverride = List.of("user", "host");
+    List<String> paramsToOverride = List.of("user", "host"); // NON-NLS
 
     String configServiceQueryString = configServiceUri.getQuery();
     Map<String, List<String>> queryParamsMap;
@@ -579,11 +579,11 @@ private URI adaptConfigServiceURI(URI configServiceUri) throws URISyntaxExceptio
     String user = properties.getProperty(P_WEASIS_USER);
 
     if (Utils.hasText(user)) {
-      queryParamsMap.put("user", List.of(user));
-    } else if (!queryParamsMap.containsKey("user")) {
+      queryParamsMap.put("user", List.of(user)); // NON-NLS
+    } else if (!queryParamsMap.containsKey("user")) { // NON-NLS
       user = System.getProperty("user.name");
       if (user != null) {
-        queryParamsMap.putIfAbsent("user", List.of(user));
+        queryParamsMap.putIfAbsent("user", List.of(user)); // NON-NLS
       } else {
         LOGGER.error("Cannot get system user.name from Launcher");
       }
@@ -592,12 +592,12 @@ private URI adaptConfigServiceURI(URI configServiceUri) throws URISyntaxExceptio
     // Add or Force replace the 'host' parameter defined in config service query parameter.
     String hostFromLocal = null;
 
-    List<String> queryParamHosts = queryParamsMap.get("host");
+    List<String> queryParamHosts = queryParamsMap.get("host"); // NON-NLS
     String queryParamHost = (queryParamHosts != null) ? queryParamHosts.getFirst() : null;
 
     try {
       hostFromLocal = getHostName();
-      queryParamsMap.put("host", List.of(hostFromLocal));
+      queryParamsMap.put("host", List.of(hostFromLocal)); // NON-NLS
     } catch (Exception e) {
       String err = "Cannot get local hostname from Launcher";
       if (Utils.hasText(queryParamHost))
@@ -665,7 +665,7 @@ private Map<String, List<String>> getConfigParamsFromServicePath() {
     try {
       URI configServiceUri = new URI(configServicePath);
 
-      if (configServiceUri.getScheme().startsWith("file")) {
+      if (configServiceUri.getScheme().startsWith("file")) { // NON-NLS
         stream = new FileInputStream(new File(configServiceUri));
       } else {
         URI adaptedConfigServiceUri = adaptConfigServiceURI(configServiceUri);