Merge remote branch 'origin/V7_dev'

diff --git a/src/PVGUI/resources/PARAVIS_msg_en.ts b/src/PVGUI/resources/PARAVIS_msg_en.ts
index 55e4ba6a69c5fe6a96f1f184dd19f29264f72dab..fc5cc66f9678aca67976c54c7ab95cce7647d076 100644 (file)
--- a/src/PVGUI/resources/PARAVIS_msg_en.ts
+++ b/src/PVGUI/resources/PARAVIS_msg_en.ts
@@ -31,10 +31,6 @@
         <source>WRN_UNKNOWN_COMMAND</source>
         <translation>Unrecognized command!</translation>
     </message>
-    <message>
-        <source>BUT_OK</source>
-        <translation>&amp;OK</translation>
-    </message>
     <message>
         <source>WRN_ADD_FAILED</source>
         <translation>Can&apos;t insert line!</translation>

diff --git a/src/PVGUI/resources/PARAVIS_msg_fr.ts b/src/PVGUI/resources/PARAVIS_msg_fr.ts
index 7b1430167edf961d10c39a037159fd232081bfbb..3574e2ae4cd736af041ebd21ead70d04e3935655 100644 (file)
--- a/src/PVGUI/resources/PARAVIS_msg_fr.ts
+++ b/src/PVGUI/resources/PARAVIS_msg_fr.ts
@@ -43,10 +43,6 @@
         <source>WRN_UNKNOWN_COMMAND</source>
         <translation>Commande inconnue !</translation>
     </message>
-    <message>
-        <source>BUT_OK</source>
-        <translation>&amp;OK</translation>
-    </message>
     <message>
         <source>WRN_ADD_FAILED</source>
         <translation>Impossible d&apos;insérer la ligne !</translation>

diff --git a/src/PVGUI/resources/PARAVIS_msg_ja.ts b/src/PVGUI/resources/PARAVIS_msg_ja.ts
index 34f554ce2f998ad1104a4386a6fd88b13cffd21d..41829ab80b22bc1fb71197cb795523b8628e974f 100644 (file)
--- a/src/PVGUI/resources/PARAVIS_msg_ja.ts
+++ b/src/PVGUI/resources/PARAVIS_msg_ja.ts
@@ -31,10 +31,6 @@
       <source>WRN_UNKNOWN_COMMAND</source>
       <translation>不明なコマンド ！</translation>
     </message>
-    <message>
-      <source>BUT_OK</source>
-      <translation>わかりました(&amp;O)</translation>
-    </message>
     <message>
       <source>WRN_ADD_FAILED</source>
       <translation>行を挿入できません。</translation>