erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-29 19:57:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #13555 from keymanapp/fix/windows/13489/update-tab-improvements

Browse source 
fix(windows): configuration update tab text changes
This commit is contained in:
rc-swag 2025-03-27 09:19:52 +10:00 • committed by GitHub
commit 228fcd193e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 34 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
windows/src/desktop/kmshell/locale/cs-CZ/strings.xml
View file

@ -465,7 +465,7 @@
<!-- Context: Configuration Dialog - Update tab -->
<!-- String Type: PlainText -->
<!-- Introduced: 18.0.168 -->
<string name="S_Updates_Available" comment="Update tab - informs user updates are available ">K dispozici jsou aktualizace, které budou aplikovány při příštím restartu Windows.</string>
<string name="S_Updates_Available" comment="Update tab - informs user updates are available ">K dispozici jsou aktualizace, které budou aplikovány při příštím restartu Windows:</string>
<!-- Context: Configuration Dialog - Update tab pop up -->
<!-- String Type: PlainText -->
<!-- Introduced: 18.0.168 -->

2
windows/src/desktop/kmshell/locale/el-polyton/strings.xml
View file

@ -465,7 +465,7 @@
<!-- Context: Configuration Dialog - Update tab -->
<!-- String Type: PlainText -->
<!-- Introduced: 18.0.168 -->
<string name="S_Updates_Available" comment="Update tab - informs user updates are available ">Ὑπάρχουν ἐνημερώσεις ποὺ θὰ ἐφαρμοσθοῦν κατὰ τὴν ἑπόμενη ἐκκίνηση τῶν Windows.</string>
<string name="S_Updates_Available" comment="Update tab - informs user updates are available ">Ὑπάρχουν ἐνημερώσεις ποὺ θὰ ἐφαρμοσθοῦν κατὰ τὴν ἑπόμενη ἐκκίνηση τῶν Windows:</string>
<!-- Context: Configuration Dialog - Update tab pop up -->
<!-- String Type: PlainText -->
<!-- Introduced: 18.0.168 -->

2
windows/src/desktop/kmshell/locale/es-419/strings.xml
View file

@ -465,7 +465,7 @@
<!-- Context: Configuration Dialog - Update tab -->
<!-- String Type: PlainText -->
<!-- Introduced: 18.0.168 -->
<string name="S_Updates_Available" comment="Update tab - informs user updates are available ">Hay actualizaciones disponibles que se aplicarán cuando se reinicie Windows.</string>
<string name="S_Updates_Available" comment="Update tab - informs user updates are available ">Hay actualizaciones disponibles que se aplicarán cuando se reinicie Windows:</string>
<!-- Context: Configuration Dialog - Update tab pop up -->
<!-- String Type: PlainText -->
<!-- Introduced: 18.0.168 -->

2
windows/src/desktop/kmshell/locale/es-ES/strings.xml
View file

@ -465,7 +465,7 @@
<!-- Context: Configuration Dialog - Update tab -->
<!-- String Type: PlainText -->
<!-- Introduced: 18.0.168 -->
<string name="S_Updates_Available" comment="Update tab - informs user updates are available ">Hay actualizaciones disponibles que se aplicarán cuando se reinicie Windows.</string>
<string name="S_Updates_Available" comment="Update tab - informs user updates are available ">Hay actualizaciones disponibles que se aplicarán cuando se reinicie Windows:</string>
<!-- Context: Configuration Dialog - Update tab pop up -->
<!-- String Type: PlainText -->
<!-- Introduced: 18.0.168 -->

2
windows/src/desktop/kmshell/locale/it-IT/strings.xml
View file

@ -465,7 +465,7 @@
<!-- Context: Configuration Dialog - Update tab -->
<!-- String Type: PlainText -->
<!-- Introduced: 18.0.168 -->
<string name="S_Updates_Available" comment="Update tab - informs user updates are available ">Sono disponibili aggiornamenti che saranno operativi al prossimo riavvio di Windows.</string>
<string name="S_Updates_Available" comment="Update tab - informs user updates are available ">Sono disponibili aggiornamenti che saranno operativi al prossimo riavvio di Windows:</string>
<!-- Context: Configuration Dialog - Update tab pop up -->
<!-- String Type: PlainText -->
<!-- Introduced: 18.0.168 -->

2
windows/src/desktop/kmshell/locale/km-KH/strings.xml
View file

@ -465,7 +465,7 @@
<!-- Context: Configuration Dialog - Update tab -->
<!-- String Type: PlainText -->
<!-- Introduced: 18.0.168 -->
<string name="S_Updates_Available" comment="Update tab - informs user updates are available ">មាន​ការអាប់ដេតដែលនឹងអនុវត្ពពេលវីនដូដំណើរការជាថ្មី</string>
<string name="S_Updates_Available" comment="Update tab - informs user updates are available ">មាន​ការអាប់ដេតដែលនឹងអនុវត្ពពេលវីនដូដំណើរការជាថ្មី:</string>
<!-- Context: Configuration Dialog - Update tab pop up -->
<!-- String Type: PlainText -->
<!-- Introduced: 18.0.168 -->

2
windows/src/desktop/kmshell/locale/mnw-MM/strings.xml
View file

@ -465,7 +465,7 @@
<!-- Context: Configuration Dialog - Update tab -->
<!-- String Type: PlainText -->
<!-- Introduced: 18.0.168 -->
<string name="S_Updates_Available" comment="Update tab - informs user updates are available ">သမၠုၚ်ပ္တိုန်တံဂှ် ယဝ်ကၟာတ်ပံက်ထောံ မုက်လိက်တုဲမ္ဂး ဒှ်ဒတန်ရ။</string>
<string name="S_Updates_Available" comment="Update tab - informs user updates are available ">သမၠုၚ်ပ္တိုန်တံဂှ် ယဝ်ကၟာတ်ပံက်ထောံ မုက်လိက်တုဲမ္ဂး ဒှ်ဒတန်ရ။:</string>
<!-- Context: Configuration Dialog - Update tab pop up -->
<!-- String Type: PlainText -->
<!-- Introduced: 18.0.168 -->

2
windows/src/desktop/kmshell/locale/vi-VN/strings.xml
View file

@ -465,7 +465,7 @@
<!-- Context: Configuration Dialog - Update tab -->
<!-- String Type: PlainText -->
<!-- Introduced: 18.0.168 -->
<string name="S_Updates_Available" comment="Update tab - informs user updates are available ">Các bản cập nhật hiện có sẽ được áp dụng khi Windows được khởi động lại lần tiếp theo.</string>
<string name="S_Updates_Available" comment="Update tab - informs user updates are available ">Các bản cập nhật hiện có sẽ được áp dụng khi Windows được khởi động lại lần tiếp theo:</string>
<!-- Context: Configuration Dialog - Update tab pop up -->
<!-- String Type: PlainText -->
<!-- Introduced: 18.0.168 -->

8
windows/src/desktop/kmshell/xml/config.css
View file

@ -1160,14 +1160,12 @@ th
{
font-size: 13px;
margin-left: 64px;
margin-top: 30px;
margin-top: 64px;
margin-bottom: 20px;
}
#update_content {
height: 100%;
overflow: hidden;
display: flex;
flex-direction: column;
display: block;
padding: 5px 10px 5px 10px;
}

12
windows/src/desktop/kmshell/xml/keyman_update.xsl
View file

@ -33,8 +33,8 @@
<div class="grid_container_update" id="update_details">
<!-- hide header if no updates but keep the grid layout -->
<xsl:if test="$isNewKeymanVersionAvailable or $isNewKeyboardVersionAvailable">
<div class='grid_item'><xsl:value-of select="$locale/string[@name='S_Update_ComponentHead']"/></div>
<div class='grid_item'><xsl:value-of select="$locale/string[@name='S_Update_OldVersionHead']"/></div>
<div class='grid_item'><xsl:value-of select="$locale/string[@name='S_Update_New_Version']"/></div>
<div class='grid_item'><xsl:value-of select="$locale/string[@name='S_Update_Current_Version']"/></div>
<div class='grid_item'><xsl:value-of select="$locale/string[@name='S_Update_SizeHead']"/></div>
</xsl:if>
<xsl:apply-templates select="/Keyman/Updates/Update" />
@ -46,16 +46,16 @@
<xsl:choose>
<xsl:when test="$isNewKeymanVersionAvailable or $isNewKeyboardVersionAvailable">
<xsl:call-template name="button">
<xsl:with-param name="caption"><xsl:value-of select="$locale/string[@name='S_Button_Update_ApplyNow']"/></xsl:with-param>
<xsl:with-param name="caption"><xsl:value-of select="$locale/string[@name='S_Button_Update_InstallNow']"/></xsl:with-param>
<xsl:with-param name="command">keyman:update_applynow</xsl:with-param>
<xsl:with-param name="width">220px</xsl:with-param>
<xsl:with-param name="width">200px</xsl:with-param>
</xsl:call-template>
</xsl:when>
<xsl:otherwise>
<xsl:call-template name="button">
<xsl:with-param name="caption"><xsl:value-of select="$locale/string[@name='S_Button_Update_ApplyNow']"/></xsl:with-param>
<xsl:with-param name="caption"><xsl:value-of select="$locale/string[@name='S_Button_Update_InstallNow']"/></xsl:with-param>
<xsl:with-param name="command"></xsl:with-param>
<xsl:with-param name="width">220px</xsl:with-param>
<xsl:with-param name="width">200px</xsl:with-param>
<xsl:with-param name="disabled">1</xsl:with-param>
</xsl:call-template>
</xsl:otherwise>

19
windows/src/desktop/kmshell/xml/strings.xml
View file

@ -591,12 +591,22 @@
<!-- Context: Configuration Dialog - Update tab -->
<!-- String Type: PlainText -->
<!-- Introduced: 18.0.168 -->
<string name="S_Updates_Available" comment="Update tab - informs user updates are available ">Updates are available which will be applied when Windows is next restarted.</string>
<string name="S_Updates_Available" comment="Update tab - informs user updates are available ">Updates are available which will be applied when Windows is next restarted:</string>
<!-- Context: Configuration Dialog - Update tab -->
<!-- String Type: PlainText -->
<!-- Introduced: 18.0.217 -->
<string name="S_Update_Current_Version" comment="Update tab Currently Installed Version">Currently installed version</string>
<!-- Context: Configuration Dialog - Update tab -->
<!-- String Type: PlainText -->
<!-- Introduced: 18.0.217 -->
<string name="S_Update_New_Version" comment="Update tab New Version">New version</string>
<!-- Context: Configuration Dialog - Update tab pop up -->
<!-- String Type: PlainText -->
<!-- Introduced: 18.0.168 -->
<string name="S_Update_Restart_Req" comment="Update tab pop up - warns user restart will require restart ">Applying the update now will require a restart of your computer before you can use Keyman again. Update now anyway?</string>
<string name="S_Update_Restart_Req" comment="Update tab pop up - warns user restart will require restart ">Installing the update now will require a restart of your computer before you can use Keyman again. Update now anyway?</string>
<!-- Context: Configuration Dialog - Update on boot pop up -->
<!-- String Type: PlainText -->
@ -835,6 +845,11 @@ keyboard that you use in Windows. Keyman keyboards will adapt automatically to
<!-- Introduced: 17.0233.0 -->
<string name="S_Button_Update_ApplyNow" comment="Apply update now button - update dialog">Apply update now</string>
<!-- Context: Update Dialog -->
<!-- String Type: FormatString -->
<!-- Introduced: 18.0.217 -->
<string name="S_Button_Update_InstallNow" comment="Install update now button - update dialog">Install update now</string>
<!-- Context: Update Dialog -->
<!-- String Type: FormatString -->
<!-- Introduced: 17.0233.0 -->