Merge remote-tracking branch 'origin/master'

AlmaLinux · Dec 10, 2024 · b98cef8 · b98cef8
2 parents 71f9399 + 45e1381
commit b98cef8
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/content/blog/2024-12-09-welcome-to-aldt.md b/content/blog/2024-12-09-welcome-to-aldt.md
@@ -34,6 +34,10 @@ Opening talks begin at 1:00pm local time, with some awesome content in store fro
       <td nowrap class="aldt_time">12:30 - 13:00</td>
       <td colspan="3">Registration and checkin opens</td>
     </tr>
+    <tr>
+      <td nowrap class="aldt_time">13:00</td>
+      <td colspan="3">AlmaLinux Day Welcome and Introduction</td>
+    </tr>
     <tr>
       <td nowrap class="aldt_time">13:10 - 14:10</td>
       <td colspan="3" style="width:100%;">

diff --git a/i18n/en.json b/i18n/en.json
@@ -731,7 +731,6 @@
    "Hewlett Packard Japan, G.K.": "Hewlett Packard Japan, G.K.",
    "Yuichi Aoyama": "Yuichi Aoyama",
    "Challenges to automatic OS and middleware updates for safer and more flexible operations with AlmaLinux": "Challenges to automatic OS and middleware updates for safer and more flexible operations with AlmaLinux",
-   "Cybertrust's AlmaLinux efforts and contributions - from last year's AlmaLinux Day Tokyo to now": "Cybertrust's AlmaLinux efforts and contributions - from last year's AlmaLinux Day Tokyo to now",
    "AlmaLinux for Enterprise!": "AlmaLinux for Enterprise!",
    "Navigating the open source world can be harrowing for businesses, but AlmaLinux is ready to solve your operating system needs!": "Navigating the open source world can be harrowing for businesses, but AlmaLinux is ready to solve your operating system needs!",
    "Event Details": "Event Details",
@@ -766,5 +765,7 @@
    "Lead Architect & ALESCo Member": "Lead Architect & ALESCo Member",
    "Infra, Certification SIG Lead, & ALESCo Member": "Infra, Certification SIG Lead, & ALESCo Member",
    "Date and time:": "Date and time:",
-   "Saturday, December 14, 2024, 13:00-20:00 (doors open at 12:30)": "Saturday, December 14, 2024, 13:00-20:00 (doors open at 12:30)"
+   "Saturday, December 14, 2024, 13:00-20:00 (doors open at 12:30)": "Saturday, December 14, 2024, 13:00-20:00 (doors open at 12:30)",
+   "AlmaLinux Day Welcome and Introduction": "AlmaLinux Day Welcome and Introduction",
+   "Cybertrust's AlmaLinux efforts and contributions - from last year's AlmaLinux Day: Tokyo to now": "Cybertrust's AlmaLinux efforts and contributions - from last year's AlmaLinux Day: Tokyo to now"
 }
diff --git a/layouts/aldt-2024/single.html b/layouts/aldt-2024/single.html
@@ -122,7 +122,13 @@ <h1 style="font-size: 80px; text-align: center; letter-spacing: 0.80px; font-wei
               <td colspan="3">{{ i18n "Registration and checkin opens" }}</td>
             </tr>
             <tr>
-              <td nowrap class="aldt_time">13:10 - 14:10</td>
+              <td nowrap class="aldt_time">13:00</td>
+              <td colspan="3" style="width:100%;">
+				{{ i18n "AlmaLinux Day Welcome and Introduction" }}
+			  </td>
+            </tr>
+            <tr>
+              <td nowrap class="aldt_time">13:10</td>
               <td colspan="3" style="width:100%;">
 				 <img class="img-fluid rounded-circle mb-3" src="/board/benny.jpg" alt="benny Vasquez" style="max-width: 40px;"> <img class="img-fluid rounded-circle mb-3" src="/users/alukoshko.jpg" alt="Andrew Lukoshko" style="max-width: 40px;"> <img class="img-fluid rounded-circle mb-3" src="/users/jonathan.jpg" alt="Jonathan Wright" style="max-width: 40px;"> <br />
 				 {{ i18n "AlmaLinux and Compatibility with RHEL" }} ({{ i18n "benny Vasquez" }} - {{ i18n "AlmaLinux OS Foundation Chair" }}) <br />
@@ -131,20 +137,20 @@ <h1 style="font-size: 80px; text-align: center; letter-spacing: 0.80px; font-wei
 			  </td>
             </tr>
             <tr>
-              <td nowrap class="aldt_time">14:25 - 15:05</td>
+              <td nowrap class="aldt_time">14:25</td>
               <td colspan="3" style="width:100%;">
 					 <img class="img-fluid rounded-circle mb-3" src="/2024speakers/DaikiOrihara.jpeg" alt="Daiki Orihara" style="max-width: 40px;"> <br />
 				{{ i18n "Next-generation digital social infrastructure and generative AI" }} ({{ i18n "Daiki Orihara" }} - {{ i18n "SB Intuitions Corp., SoftBank Corp." }})
 			  </td>
             </tr>
             <tr>
-              <td nowrap class="aldt_time">15:10 - 16:10</td>
+              <td nowrap class="aldt_time">15:10</td>
               <td colspan="3" style="width:100%;">
 					 <img class="img-fluid rounded-circle mb-3" src="/2024speakers/Ryota_Imamura.jpeg" alt="Ryota Imamura" style="max-width: 40px;"> <img class="img-fluid rounded-circle mb-3" src="/2024speakers/Naoki_Watanabe.png" alt="Naoki Watanabe" style="max-width: 40px;"> <img class="img-fluid rounded-circle mb-3" src="/2024speakers/Masazumi_Koga.png" alt="Masazumi Koga" style="max-width: 40px;"> <img class="img-fluid rounded-circle mb-3" src="/2024speakers/yuichi_aoyama.jpg" alt="Yuichi Aoyama" style="max-width: 40px;"><br />
 				{{ i18n "Successful Cases and Know-How of Utilizing Open Source Software with AlmaLinux" }} ({{ i18n "Ryota Imamura" }} - {{ i18n "DesigNET" }})  <br />
 				{{ i18n "Challenges to automatic OS and middleware updates for safer and more flexible operations with AlmaLinux" }} ({{ i18n "Naoki Watanabe" }} - {{ i18n "Prime Strategy Co., Ltd." }}) <br />
 				{{ i18n "The author of 'AlmaLinux 9 Practical Guide' talks about the front line of Arm servers." }} ({{ i18n "Masazumi Koga" }} - {{ i18n "Hewlett Packard Japan, G.K." }}) <br />
-				{{ i18n "Cybertrust's AlmaLinux efforts and contributions - from last year's AlmaLinux Day Tokyo to now" }} ({{ i18n "Yuichi Aoyama" }} - {{ i18n "Cybertrust Japan Co., Ltd." }})
+				{{ i18n "Cybertrust's AlmaLinux efforts and contributions - from last year's AlmaLinux Day: Tokyo to now" }} ({{ i18n "Yuichi Aoyama" }} - {{ i18n "Cybertrust Japan Co., Ltd." }})
 			  </td>
             </tr>
             <tr>
@@ -154,7 +160,7 @@ <h1 style="font-size: 80px; text-align: center; letter-spacing: 0.80px; font-wei
 			  </td>
             </tr>
             <tr>
-              <td nowrap class="aldt_time">17:00</td>
+              <td nowrap class="aldt_time">17:00 - 19:00</td>
               <td colspan="3" style="width:100%;">
 				{{ i18n "Social Gathering and Lightning talks!" }} 
 			  </td>