Intelligent commenting/commenting

vdelachaux · Oct 10, 2023 · b84a210 · b84a210
1 parent 9154e35
commit b84a210
Show file tree

Hide file tree

Showing 32 changed files with 526 additions and 2,661 deletions.
diff --git a/Build/4DPop Macros.4dbase.zip b/Build/4DPop Macros.4dbase.zip
diff --git a/Build/Components/4DPop Macros.4dbase/4DPop Macros.4DZ b/Build/Components/4DPop Macros.4dbase/4DPop Macros.4DZ
diff --git a/Build/Components/4DPop Macros.4dbase/Info.plist b/Build/Components/4DPop Macros.4dbase/Info.plist
@@ -6,13 +6,13 @@
     <key>CFBundleName</key>
     <string>4DPop Macros</string>
     <key>CFBundleVersion</key>
-    <string>264</string>
+    <string>269</string>
     <key>NSHumanReadableCopyright</key>
     <string>©vdl 2009-2023</string>
     <key>CFBundleGetInfoString</key>
     <string>20R4</string>
     <key>CFBundleLongVersionString</key>
-    <string>20R4 (263)</string>
+    <string>20R4 (268)</string>
     <key>CFBundleShortVersionString</key>
     <string>20R4</string>
     <key>CFBundleDisplayName</key>

diff --git a/Build/Components/4DPop Macros.4dbase/Libraries/lib4d-arm64.dylib b/Build/Components/4DPop Macros.4dbase/Libraries/lib4d-arm64.dylib
diff --git a/Build/Components/4DPop Macros.4dbase/Macros v2/4DPop_Macros.xml b/Build/Components/4DPop Macros.4dbase/Macros v2/4DPop_Macros.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE macros SYSTEM "http://www.4d.com/dtd/2007/macros.dtd" >
 
 <!--
-    4DPop macros - [US]
+    4DPop macros - [EN]
     vincent@de-lachaux.net
 -->
 
@@ -118,18 +118,18 @@
         <text>Maquereau 4D : <caret/></text>        
     </macro>
 
-    <macro name="Duplicate and comment/∂" 
-        in_menu="true" 
-        type_ahead="false" 
+    <macro name="Comment"
+        in_menu="true"
+        type_ahead="false"
         version="2">
-        <text><method>4DPop_MACROS("duplicateAndComment")</method></text>
+        <text><method>4DPop_MACROS("comment")</method></text>
     </macro>
 
-    <macro name="Comment block" 
-        in_menu="true" 
-        type_ahead="false" 
+    <macro name="Duplicate and comment/∂"
+        in_menu="true"
+        type_ahead="false"
         version="2">
-        <text><method>4DPop_MACROS("commentBlock")</method></text>
+        <text><method>4DPop_MACROS("duplicateAndComment")</method></text>
     </macro>
 
     <!-- ******************************* REFACTORING ******************************* -->

diff --git a/Build/Components/4DPop Macros.4dbase/Resources/4DPop_Macros.xml b/Build/Components/4DPop Macros.4dbase/Resources/4DPop_Macros.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE macros SYSTEM "http://www.4d.com/dtd/2007/macros.dtd" >
 
 <!--
-    4DPop macros - [US]
+    4DPop macros - [EN]
     vincent@de-lachaux.net
 -->
 
@@ -118,18 +118,18 @@
         <text>Maquereau 4D : <caret/></text>        
     </macro>
 
-    <macro name="Duplicate and comment/∂" 
-        in_menu="true" 
-        type_ahead="false" 
+    <macro name="Comment"
+        in_menu="true"
+        type_ahead="false"
         version="2">
-        <text><method>4DPop_MACROS("duplicateAndComment")</method></text>
+        <text><method>4DPop_MACROS("comment")</method></text>
     </macro>
 
-    <macro name="Comment block" 
-        in_menu="true" 
-        type_ahead="false" 
+    <macro name="Duplicate and comment/∂"
+        in_menu="true"
+        type_ahead="false"
         version="2">
-        <text><method>4DPop_MACROS("commentBlock")</method></text>
+        <text><method>4DPop_MACROS("duplicateAndComment")</method></text>
     </macro>
 
     <!-- ******************************* REFACTORING ******************************* -->

diff --git a/Build/Components/4DPop Macros.4dbase/Resources/InfoPlist.strings b/Build/Components/4DPop Macros.4dbase/Resources/InfoPlist.strings
diff --git a/Build/Components/4DPop Macros.4dbase/Resources/_ja.lproj/4DPop Macros.xlf b/Build/Components/4DPop Macros.4dbase/Resources/_ja.lproj/4DPop Macros.xlf