VirtualBox

Ignore:
Timestamp:
Dec 16, 2020 2:05:36 PM (4 years ago)
Author:
vboxsync
Message:

Forwardported r141920: FE/Qt: bugref:9889: Directly adjusting NLS contents according to changes in r141905.

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:mergeinfo
      •  

        old new  
        1010/branches/VBox-5.2:119536,120083,120099,120213,120221,120239,123597-123598,123600-123601,123755,124260,124263,124271,124273,124277-124279,124284-124286,124288-124290,125768,125779-125780,125812
        1111/branches/VBox-6.0:130474-130475,130477,130479,131352
        12 /branches/VBox-6.1:139660,139797,141521,141567-141568,141588-141590,141592-141595,141652
         12/branches/VBox-6.1:139660,139797,141521,141567-141568,141588-141590,141592-141595,141652,141920
        1313/branches/aeichner/vbox-chromium-cleanup:129816,129818-129851,129853-129861,129871-129872,129876,129880,129882,130013-130015,130036,130094-130095
        1414/branches/andy/draganddrop:90781-91268
  • trunk/src/VBox

    • Property svn:mergeinfo
      •  

        old new  
        1010/branches/VBox-5.2/src/VBox:119536,120083,120099,120213,120221,120239,123597-123598,123600-123601,123755,124263,124273,124277-124279,124284-124286,124288-124290,125768,125779-125780,125812,127158-127159,127162-127167,127180
        1111/branches/VBox-6.0/src/VBox:130474-130475,130477,130479,131352
        12 /branches/VBox-6.1/src/VBox:141521,141567-141568,141588-141590,141592-141595,141652
         12/branches/VBox-6.1/src/VBox:141521,141567-141568,141588-141590,141592-141595,141652,141920
        1313/branches/aeichner/vbox-chromium-cleanup/src/VBox:129818-129851,129853-129861,129871-129872,129876,129880,129882,130013-130015,130094-130095
        1414/branches/andy/draganddrop/src/VBox:90781-91268
  • trunk/src/VBox/Frontends

    • Property svn:mergeinfo
      •  

        old new  
        99/branches/VBox-5.2/src/VBox/Frontends:120213,124288
        1010/branches/VBox-6.0/src/VBox/Frontends:130474-130475,130477,130479
         11/branches/VBox-6.1/src/VBox/Frontends:141920
        1112/branches/andy/draganddrop/src/VBox/Frontends:90781-91268
        1213/branches/andy/guestctrl20/src/VBox/Frontends:78916,78930
  • trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts

    r86997 r87093  
    41284128    </message>
    41294129    <message>
    4130         <source>IDE Primary Master</source>
     4130        <source>IDE Primary Device 0</source>
    41314131        <comment>StorageSlot</comment>
    41324132        <translation type="unfinished">第一IDE控制器主通道</translation>
    41334133    </message>
    41344134    <message>
    4135         <source>IDE Primary Slave</source>
     4135        <source>IDE Primary Device 1</source>
    41364136        <comment>StorageSlot</comment>
    41374137        <translation type="unfinished">第一IDE控制器从通道</translation>
    41384138    </message>
    41394139    <message>
    4140         <source>IDE Secondary Master</source>
     4140        <source>IDE Secondary Device 0</source>
    41414141        <comment>StorageSlot</comment>
    41424142        <translation type="unfinished">第二IDE控制器主通道</translation>
    41434143    </message>
    41444144    <message>
    4145         <source>IDE Secondary Slave</source>
     4145        <source>IDE Secondary Device 1</source>
    41464146        <comment>StorageSlot</comment>
    41474147        <translation type="unfinished">第二IDE控制器从通道</translation>
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette