Ros-diffs May 2015

ros-diffs@reactos.org

15 participants
500 discussions

[akhaldi] 67754: [SHELL32] Add "..." to the copying operation title. By Jared Smudde. CORE-9634
by akhaldi＠svn.reactos.org 16 May '15

16 May '15

Author: akhaldi Date: Sat May 16 09:11:23 2015 New Revision: 67754 URL: http://svn.reactos.org/svn/reactos?rev=67754&view=rev Log: [SHELL32] Add "..." to the copying operation title. By Jared Smudde. CORE-9634 Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/he-IL.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sq-AL.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Sat May 16 09:11:23 2015 @@ -697,9 +697,9 @@ IDS_OVERWRITEFILE_CAPTION "ÐÐ¾ÑÐ²ÑÑÐ¶Ð´Ð°Ð²Ð°Ð½Ðµ Ð·Ð°Ð¼ÑÐ½Ð°ÑÐ° Ð½Ð° ÑÐ°Ð¹Ð»Ð°" IDS_OVERWRITEFOLDER_TEXT "Ð¢Ð°Ð·Ð¸ Ð¿Ð°Ð¿ÐºÐ° Ð²ÐµÑÐµ ÑÑÐ´ÑÑÐ¶Ð° Ð¿Ð°Ð¿ÐºÐ° Ñ Ð¸Ð¼Ðµ '%1'.\n\nÐÐºÐ¾ ÑÐ°Ð¹Ð»Ð¾Ð²ÐµÑÐµ Ð² ÑÐµÐ»ÐµÐ²Ð°ÑÐ° Ð¿Ð°Ð¿ÐºÐ° Ð¸Ð¼Ð°Ñ ÑÑÑÐ¸ÑÐµ Ð¸Ð¼ÐµÐ½Ð° ÐºÐ°ÑÐ¾ ÑÐ°Ð¹Ð»Ð¾Ð²ÐµÑÐµ Ð²\nÐ¸Ð·Ð±ÑÐ°Ð½Ð°ÑÐ° Ð¿Ð°Ð¿ÐºÐ°, ÑÐµ ÑÐµ Ð±ÑÐ´Ð°Ñ Ð·Ð°Ð¼ÐµÐ½ÐµÐ½Ð¸. ÐÑÐµ Ð¾ÑÐµ Ð»Ð¸ Ð¸ÑÐºÐ°ÑÐµ Ð´Ð° Ð¿ÑÐµÐ¼ÐµÑÑÐ¸ÑÐµ\nÐ¸Ð»Ð¸ Ð¿ÑÐµÐ·Ð°Ð¿Ð¸ÑÐµÑÐµ Ð¿Ð°Ð¿ÐºÐ°ÑÐ°?" - IDS_FILEOOP_COPYING "Copying" - IDS_FILEOOP_MOVING "Moving" - IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_COPYING "Copying..." + IDS_FILEOOP_MOVING "Moving..." + IDS_FILEOOP_DELETING "Deleting..." IDS_FILEOOP_FROM_TO "From %1 to %2" IDS_FILEOOP_FROM "From %1" IDS_FILEOOP_PREFLIGHT "Preflight" Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Sat May 16 09:11:23 2015 @@ -697,9 +697,9 @@ IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" - IDS_FILEOOP_COPYING "Copying" - IDS_FILEOOP_MOVING "Moving" - IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_COPYING "Copying..." + IDS_FILEOOP_MOVING "Moving..." + IDS_FILEOOP_DELETING "Deleting..." IDS_FILEOOP_FROM_TO "From %1 to %2" IDS_FILEOOP_FROM "From %1" IDS_FILEOOP_PREFLIGHT "Preflight" Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Sat May 16 09:11:23 2015 @@ -703,9 +703,9 @@ IDS_OVERWRITEFILE_CAPTION "Potvrdit pÅepsÃ¡nÃ souboru" IDS_OVERWRITEFOLDER_TEXT "Tato sloÅ¾ka jiÅ¾ obsahuje sloÅ¾ku s nÃ¡zvem '%1'.\n\nPokud majÃ soubory v cÃlovÃ© sloÅ¾ce stejnÃ© nÃ¡zvy jako soubory ve zvolenÃ©\nsloÅ¾ce, budou pÅepsÃ¡ny. Opravdu chcete pÅesunout nebo zkopÃrovat tuto sloÅ¾ku?" - IDS_FILEOOP_COPYING "Copying" - IDS_FILEOOP_MOVING "Moving" - IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_COPYING "Copying..." + IDS_FILEOOP_MOVING "Moving..." + IDS_FILEOOP_DELETING "Deleting..." IDS_FILEOOP_FROM_TO "From %1 to %2" IDS_FILEOOP_FROM "From %1" IDS_FILEOOP_PREFLIGHT "Preflight" Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Sat May 16 09:11:23 2015 @@ -703,9 +703,9 @@ IDS_OVERWRITEFILE_CAPTION "BekrÃ¦ft overskrivelse af fil" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" - IDS_FILEOOP_COPYING "Copying" - IDS_FILEOOP_MOVING "Moving" - IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_COPYING "Copying..." + IDS_FILEOOP_MOVING "Moving..." + IDS_FILEOOP_DELETING "Deleting..." IDS_FILEOOP_FROM_TO "From %1 to %2" IDS_FILEOOP_FROM "From %1" IDS_FILEOOP_PREFLIGHT "Preflight" Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Sat May 16 09:11:23 2015 @@ -697,9 +697,9 @@ IDS_OVERWRITEFILE_CAPTION "ÎÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ· Î´Î¹Î±Î³ÏÎ±ÏÎ®Ï Î±ÏÏÎµÎ¯Î¿Ï" IDS_OVERWRITEFOLDER_TEXT "ÎÏÏÏÏ Î¿ ÏÎ¬ÎºÎµÎ»Î¿Ï ÏÎµÏÎ¹ÎÏÎµÎ¹ Î®Î´Î· ÎÎ½Î±Î½ ÏÎ¬ÎºÎµÎ»Î¿ ed '%1'.\n\nÎÎ½ ÏÎ± Î±ÏÏÎµÎ¯Î± ÏÏÎ¿Î½ ÏÎ¬ÎºÎµÎ»Î¿ ÏÏÎ¿Î¿ÏÎ¹ÏÎ¼Î¿Ï ÎÏÎ¿ÏÎ½ Î¯Î´Î¹Î± Î¿Î½ÏÎ¼Î±ÏÎ± Î¼Îµ ÏÎ± Î±ÏÏÎµÎ¯Î± ÏÏÎ¿Î½\nÎµÏÎ¹Î»ÎµÎ³Î¼ÎÎ½Î¿ ÏÎ¬ÎºÎµÎ»Î¿ Î¸Î± Î±Î½ÏÎ¹ÎºÎ±ÏÎ±ÏÏÎ±Î¸Î¿ÏÎ½. ÎÎ¯ÏÏÎµ ÏÎ¯Î³Î¿ÏÏÎ¿Î¹ ÏÏÎ¹ Î¸ÎÎ»ÎµÏÎµ Î½Î± ÏÏÎ½ÎµÏÎ¯ÏÎµÏÎµ;\nthe folder?" - IDS_FILEOOP_COPYING "Copying" - IDS_FILEOOP_MOVING "Moving" - IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_COPYING "Copying..." + IDS_FILEOOP_MOVING "Moving..." + IDS_FILEOOP_DELETING "Deleting..." IDS_FILEOOP_FROM_TO "From %1 to %2" IDS_FILEOOP_FROM "From %1" IDS_FILEOOP_PREFLIGHT "Preflight" Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Sat May 16 09:11:23 2015 @@ -697,9 +697,9 @@ IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" - IDS_FILEOOP_COPYING "Copying" - IDS_FILEOOP_MOVING "Moving" - IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_COPYING "Copying..." + IDS_FILEOOP_MOVING "Moving..." + IDS_FILEOOP_DELETING "Deleting..." IDS_FILEOOP_FROM_TO "From %1 to %2" IDS_FILEOOP_FROM "From %1" IDS_FILEOOP_PREFLIGHT "Preflight" Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Sat May 16 09:11:23 2015 @@ -697,9 +697,9 @@ IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" - IDS_FILEOOP_COPYING "Copying" - IDS_FILEOOP_MOVING "Moving" - IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_COPYING "Copying..." + IDS_FILEOOP_MOVING "Moving..." + IDS_FILEOOP_DELETING "Deleting..." IDS_FILEOOP_FROM_TO "From %1 to %2" IDS_FILEOOP_FROM "From %1" IDS_FILEOOP_PREFLIGHT "Preflight" Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Sat May 16 09:11:23 2015 @@ -698,9 +698,9 @@ IDS_OVERWRITEFILE_CAPTION "Confirmar el reemplazo de archivo" IDS_OVERWRITEFOLDER_TEXT "Esta carpeta ya contiene una carpeta con el nombre '%1'.\n\nSi los archivos de la carpeta existente tienen el mismo nombre que los\narchivos de la carpeta que estÃ¡ moviendo o copiando, serÃ¡n\nreemplazados. Â¿Desea mover o copiar la carpeta de todas formas?" - IDS_FILEOOP_COPYING "Copying" - IDS_FILEOOP_MOVING "Moving" - IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_COPYING "Copying..." + IDS_FILEOOP_MOVING "Moving..." + IDS_FILEOOP_DELETING "Deleting..." IDS_FILEOOP_FROM_TO "From %1 to %2" IDS_FILEOOP_FROM "From %1" IDS_FILEOOP_PREFLIGHT "Preflight" Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Sat May 16 09:11:23 2015 @@ -697,9 +697,9 @@ IDS_OVERWRITEFILE_CAPTION "Vahvista Tiedoston Ylikirjoitus" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" - IDS_FILEOOP_COPYING "Copying" - IDS_FILEOOP_MOVING "Moving" - IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_COPYING "Copying..." + IDS_FILEOOP_MOVING "Moving..." + IDS_FILEOOP_DELETING "Deleting..." IDS_FILEOOP_FROM_TO "From %1 to %2" IDS_FILEOOP_FROM "From %1" IDS_FILEOOP_PREFLIGHT "Preflight" Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Sat May 16 09:11:23 2015 @@ -697,9 +697,9 @@ IDS_OVERWRITEFILE_CAPTION "Confirmer l'Ã©crasement du fichier" IDS_OVERWRITEFOLDER_TEXT "Ce dossier contient dÃ©jÃ un dossier nommÃ© '%1'.\n\nSi les fichiers dans le dossier de destination ont les mÃªmes noms que ceux dans le\ndossier sÃ©lectionnÃ©, ils seront remplacÃ©s. Voulez-vous toujours dÃ©placer ou copier\nle dossier?" - IDS_FILEOOP_COPYING "Copying" - IDS_FILEOOP_MOVING "Moving" - IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_COPYING "Copying..." + IDS_FILEOOP_MOVING "Moving..." + IDS_FILEOOP_DELETING "Deleting..." IDS_FILEOOP_FROM_TO "From %1 to %2" IDS_FILEOOP_FROM "From %1" IDS_FILEOOP_PREFLIGHT "Preflight" Modified: trunk/reactos/dll/win32/shell32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/he-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] Sat May 16 09:11:23 2015 @@ -697,9 +697,9 @@ IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" - IDS_FILEOOP_COPYING "Copying" - IDS_FILEOOP_MOVING "Moving" - IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_COPYING "Copying..." + IDS_FILEOOP_MOVING "Moving..." + IDS_FILEOOP_DELETING "Deleting..." IDS_FILEOOP_FROM_TO "From %1 to %2" IDS_FILEOOP_FROM "From %1" IDS_FILEOOP_PREFLIGHT "Preflight" Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Sat May 16 09:11:23 2015 @@ -697,9 +697,9 @@ IDS_OVERWRITEFILE_CAPTION "ÃllomÃ¡ny felÃ¼lÃrÃ¡sa" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" - IDS_FILEOOP_COPYING "Copying" - IDS_FILEOOP_MOVING "Moving" - IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_COPYING "Copying..." + IDS_FILEOOP_MOVING "Moving..." + IDS_FILEOOP_DELETING "Deleting..." IDS_FILEOOP_FROM_TO "From %1 to %2" IDS_FILEOOP_FROM "From %1" IDS_FILEOOP_PREFLIGHT "Preflight" Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Sat May 16 09:11:23 2015 @@ -697,9 +697,9 @@ IDS_OVERWRITEFILE_CAPTION "Confermare la sovrascrittura del File" IDS_OVERWRITEFOLDER_TEXT "Questa cartella contiene giÃ una cartella con nome '%1'.\n\nSe i file nella cartella di destinazione hanno gli stessi nomi di quelli della \ncartella selezionata saranno sovrascritti. Volete procedere comunque?\n" - IDS_FILEOOP_COPYING "Copying" - IDS_FILEOOP_MOVING "Moving" - IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_COPYING "Copying..." + IDS_FILEOOP_MOVING "Moving..." + IDS_FILEOOP_DELETING "Deleting..." IDS_FILEOOP_FROM_TO "From %1 to %2" IDS_FILEOOP_FROM "From %1" IDS_FILEOOP_PREFLIGHT "Preflight" Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Sat May 16 09:11:23 2015 @@ -697,9 +697,9 @@ IDS_OVERWRITEFILE_CAPTION "ãã¡ã¤ã«ä¸æ¸ãã®ç¢ºèª" IDS_OVERWRITEFOLDER_TEXT "ãã®ãã©ã«ãã«ã¯æ¢ã«ãã©ã«ã'%1'ãå«ã¾ãã¦ãã¾ãã\n\nãã£ã¬ã¯ããªãã©ã«ãåã®ãã¡ã¤ã«åãé¸æããããã©ã«ãåã®ãã¡ã¤ã«å\nã¨åãæã¯ç½®ãæãããã¾ããããã§ãããã©ã«ããç§»åã¾ãã¯\nã³ãã¼ãã¾ãã?" - IDS_FILEOOP_COPYING "Copying" - IDS_FILEOOP_MOVING "Moving" - IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_COPYING "Copying..." + IDS_FILEOOP_MOVING "Moving..." + IDS_FILEOOP_DELETING "Deleting..." IDS_FILEOOP_FROM_TO "From %1 to %2" IDS_FILEOOP_FROM "From %1" IDS_FILEOOP_PREFLIGHT "Preflight" Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Sat May 16 09:11:23 2015 @@ -697,9 +697,9 @@ IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" - IDS_FILEOOP_COPYING "Copying" - IDS_FILEOOP_MOVING "Moving" - IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_COPYING "Copying..." + IDS_FILEOOP_MOVING "Moving..." + IDS_FILEOOP_DELETING "Deleting..." IDS_FILEOOP_FROM_TO "From %1 to %2" IDS_FILEOOP_FROM "From %1" IDS_FILEOOP_PREFLIGHT "Preflight" Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Sat May 16 09:11:23 2015 @@ -697,9 +697,9 @@ IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" - IDS_FILEOOP_COPYING "Copying" - IDS_FILEOOP_MOVING "Moving" - IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_COPYING "Copying..." + IDS_FILEOOP_MOVING "Moving..." + IDS_FILEOOP_DELETING "Deleting..." IDS_FILEOOP_FROM_TO "From %1 to %2" IDS_FILEOOP_FROM "From %1" IDS_FILEOOP_PREFLIGHT "Preflight" Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] Sat May 16 09:11:23 2015 @@ -697,9 +697,9 @@ IDS_OVERWRITEFILE_CAPTION "Bekreft overskriving av fil" IDS_OVERWRITEFOLDER_TEXT "Denne mappen inneholder allerede en mappe som heter '%1'.\n\nHvis filene i destinasjon mappen har samme navn filer i \nvalgte mapper her vil bli overskrevet. Ãnsker du fortsatt Ã¥ flytte eller kopiere \ndenne mappen?" - IDS_FILEOOP_COPYING "Copying" - IDS_FILEOOP_MOVING "Moving" - IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_COPYING "Copying..." + IDS_FILEOOP_MOVING "Moving..." + IDS_FILEOOP_DELETING "Deleting..." IDS_FILEOOP_FROM_TO "From %1 to %2" IDS_FILEOOP_FROM "From %1" IDS_FILEOOP_PREFLIGHT "Preflight" Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Sat May 16 09:11:23 2015 @@ -697,9 +697,9 @@ IDS_OVERWRITEFILE_CAPTION "PotwierdÅº zastÄpienie pliku" IDS_OVERWRITEFOLDER_TEXT "Ten folder zawiera juÅ¼ katalog o nazwie '%1'.\n\nJeÅ¼eli w docelowym folderze wystÄpiÄ pliki o takich samych nazwach jak\nw wybranym folderze, to zostanÄ one zastÄpione. Czy chcesz mimo to przenieÅÄ\nlub skopiowaÄ folder?" - IDS_FILEOOP_COPYING "Copying" - IDS_FILEOOP_MOVING "Moving" - IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_COPYING "Copying..." + IDS_FILEOOP_MOVING "Moving..." + IDS_FILEOOP_DELETING "Deleting..." IDS_FILEOOP_FROM_TO "From %1 to %2" IDS_FILEOOP_FROM "From %1" IDS_FILEOOP_PREFLIGHT "Preflight" Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Sat May 16 09:11:23 2015 @@ -697,9 +697,9 @@ IDS_OVERWRITEFILE_CAPTION "Confirmar sobreescrever arquivo" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" - IDS_FILEOOP_COPYING "Copying" - IDS_FILEOOP_MOVING "Moving" - IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_COPYING "Copying..." + IDS_FILEOOP_MOVING "Moving..." + IDS_FILEOOP_DELETING "Deleting..." IDS_FILEOOP_FROM_TO "From %1 to %2" IDS_FILEOOP_FROM "From %1" IDS_FILEOOP_PREFLIGHT "Preflight" Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Sat May 16 09:11:23 2015 @@ -697,9 +697,9 @@ IDS_OVERWRITEFILE_CAPTION "Confirmar substituiÃ§Ã£o de ficheiro" IDS_OVERWRITEFOLDER_TEXT "Esta pasta jÃ¡ contÃ©m uma pasta com o nome '%1'.\n\nSe os ficheiros na pasta de destino tiverem o mesmo nome dos ficheiros na\npasta seleccionada, serÃ£o substituÃdos. Ainda assim pretende mover ou copiar\na pasta?" - IDS_FILEOOP_COPYING "Copying" - IDS_FILEOOP_MOVING "Moving" - IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_COPYING "Copying..." + IDS_FILEOOP_MOVING "Moving..." + IDS_FILEOOP_DELETING "Deleting..." IDS_FILEOOP_FROM_TO "From %1 to %2" IDS_FILEOOP_FROM "From %1" IDS_FILEOOP_PREFLIGHT "Preflight" Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Sat May 16 09:11:23 2015 @@ -697,9 +697,9 @@ IDS_OVERWRITEFILE_CAPTION "Potvrdenie prepÃsania sÃºboru" IDS_OVERWRITEFOLDER_TEXT "Tento prieÄinok uÅ¾ obsahuje prieÄinok s nÃ¡zvom '%1'.\n\nAk budÃº maÅ¥ sÃºbory v cieÄ¾ovom prieÄinku rovnakÃ© nÃ¡zvy ako sÃºbory\nvo vybranom prieÄinku, tak budÃº nahradenÃ©. StÃ¡le chcete presunÃºÅ¥\nalebo skopÃrovaÅ¥ prieÄinok?" - IDS_FILEOOP_COPYING "Copying" - IDS_FILEOOP_MOVING "Moving" - IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_COPYING "Copying..." + IDS_FILEOOP_MOVING "Moving..." + IDS_FILEOOP_DELETING "Deleting..." IDS_FILEOOP_FROM_TO "From %1 to %2" IDS_FILEOOP_FROM "From %1" IDS_FILEOOP_PREFLIGHT "Preflight" Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Sat May 16 09:11:23 2015 @@ -697,9 +697,9 @@ IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" - IDS_FILEOOP_COPYING "Copying" - IDS_FILEOOP_MOVING "Moving" - IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_COPYING "Copying..." + IDS_FILEOOP_MOVING "Moving..." + IDS_FILEOOP_DELETING "Deleting..." IDS_FILEOOP_FROM_TO "From %1 to %2" IDS_FILEOOP_FROM "From %1" IDS_FILEOOP_PREFLIGHT "Preflight" Modified: trunk/reactos/dll/win32/shell32/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sq-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] Sat May 16 09:11:23 2015 @@ -701,9 +701,9 @@ IDS_OVERWRITEFILE_CAPTION "Konfirmo mbishkrim dokumenti" IDS_OVERWRITEFOLDER_TEXT "Kjo dosje tashmÃ« pÃ«rmban njÃ« dosje me emrin '%1'.\n\nNÃ«se dosjet nÃ« dosjen e destinacionit kanÃ« emÃ«r tÃ« njÃ«jtÃ« me dokumentet nÃ« dosje\npÃ«rzgjedh ata qÃ« do tÃ« zÃ«vendÃ«sohen. A doni ende tÃ« hyni ose kopjoni\nkÃ«tÃ« dosje?" - IDS_FILEOOP_COPYING "Copying" - IDS_FILEOOP_MOVING "Moving" - IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_COPYING "Copying..." + IDS_FILEOOP_MOVING "Moving..." + IDS_FILEOOP_DELETING "Deleting..." IDS_FILEOOP_FROM_TO "From %1 to %2" IDS_FILEOOP_FROM "From %1" IDS_FILEOOP_PREFLIGHT "Preflight" Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Sat May 16 09:11:23 2015 @@ -697,9 +697,9 @@ IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" - IDS_FILEOOP_COPYING "Copying" - IDS_FILEOOP_MOVING "Moving" - IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_COPYING "Copying..." + IDS_FILEOOP_MOVING "Moving..." + IDS_FILEOOP_DELETING "Deleting..." IDS_FILEOOP_FROM_TO "From %1 to %2" IDS_FILEOOP_FROM "From %1" IDS_FILEOOP_PREFLIGHT "Preflight" Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Sat May 16 09:11:23 2015 @@ -697,9 +697,9 @@ IDS_OVERWRITEFILE_CAPTION "Dosya Ãzerine YazmayÄ± Onayla" IDS_OVERWRITEFOLDER_TEXT "Bu klasÃ¶r zaten '%2' adÄ±nda bir klasÃ¶r iÃ§eriyor.\n\nVarolan klasÃ¶rdeki dosyalar, taÅÄ±yacaÄÄ±nÄ±z ya da kopyalayacaÄÄ±nÄ±z klasÃ¶rdeki dosyalarla aynÄ± adÄ± taÅÄ±yorsa, yenileriyle deÄiÅtirilir. KlasÃ¶rÃ¼ taÅÄ±mak ya da kopyalamak istiyor musunuz?" - IDS_FILEOOP_COPYING "Copying" - IDS_FILEOOP_MOVING "Moving" - IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_COPYING "Copying..." + IDS_FILEOOP_MOVING "Moving..." + IDS_FILEOOP_DELETING "Deleting..." IDS_FILEOOP_FROM_TO "From %1 to %2" IDS_FILEOOP_FROM "From %1" IDS_FILEOOP_PREFLIGHT "Preflight" Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Sat May 16 09:11:23 2015 @@ -697,9 +697,9 @@ IDS_OVERWRITEFILE_CAPTION "ÐÑÐ´ÑÐ²ÐµÑÐ´Ð¶ÐµÐ½Ð½Ñ ÐÐµÑÐµÐ·Ð°Ð¿Ð¸ÑÑ Ð¤Ð°Ð¹Ð»Ñ" IDS_OVERWRITEFOLDER_TEXT "Ð¦Ñ Ð¿Ð°Ð¿ÐºÐ° Ð²Ð¶Ðµ Ð¼ÑÑÑÐ¸ÑÑ Ð¿Ð°Ð¿ÐºÑ Ð· ÑÐ¼'ÑÐ¼ '%1'.\n\nÐ¯ÐºÑÐ¾ ÑÐ°Ð¹Ð»Ð¸ Ð² Ð¿Ð°Ð¿ÑÑ Ð¿ÑÐ¸Ð·Ð½Ð°ÑÐµÐ½Ð½Ñ Ð¼Ð°ÑÑÑ ÑÑ Ð¶ ÑÐ¼ÐµÐ½Ð°, ÑÐ¾ ÑÐ°Ð¹Ð»Ð¸ Ñ Ð²Ð¸Ð±ÑÐ°Ð½ÑÐ¹ Ð¿Ð°Ð¿ÑÑ,\nÐ²Ð¾Ð½Ð¸ Ð±ÑÐ´ÑÑÑ Ð·Ð°Ð¼ÑÐ½ÐµÐ½Ñ. ÐÐ¸ Ð²ÑÐµ ÑÐµ Ð±Ð°Ð¶Ð°ÑÑÐµ Ð¿ÐµÑÐµÐ¼ÑÑÑÐ¸ÑÐ¸ Ð°Ð±Ð¾\nÑÐºÐ¾Ð¿ÑÑÐ²Ð°ÑÐ¸ Ð¿Ð°Ð¿ÐºÑ?" - IDS_FILEOOP_COPYING "Copying" - IDS_FILEOOP_MOVING "Moving" - IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_COPYING "Copying..." + IDS_FILEOOP_MOVING "Moving..." + IDS_FILEOOP_DELETING "Deleting..." IDS_FILEOOP_FROM_TO "From %1 to %2" IDS_FILEOOP_FROM "From %1" IDS_FILEOOP_PREFLIGHT "Preflight" Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Sat May 16 09:11:23 2015 @@ -706,9 +706,9 @@ IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" - IDS_FILEOOP_COPYING "Copying" - IDS_FILEOOP_MOVING "Moving" - IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_COPYING "Copying..." + IDS_FILEOOP_MOVING "Moving..." + IDS_FILEOOP_DELETING "Deleting..." IDS_FILEOOP_FROM_TO "From %1 to %2" IDS_FILEOOP_FROM "From %1" IDS_FILEOOP_PREFLIGHT "Preflight" Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Sat May 16 09:11:23 2015 @@ -705,9 +705,9 @@ IDS_OVERWRITEFILE_CAPTION "Confirm file overwrite" IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" - IDS_FILEOOP_COPYING "Copying" - IDS_FILEOOP_MOVING "Moving" - IDS_FILEOOP_DELETING "Deleting" + IDS_FILEOOP_COPYING "Copying..." + IDS_FILEOOP_MOVING "Moving..." + IDS_FILEOOP_DELETING "Deleting..." IDS_FILEOOP_FROM_TO "From %1 to %2" IDS_FILEOOP_FROM "From %1" IDS_FILEOOP_PREFLIGHT "Preflight"

1 0

[akhaldi] 67753: [POWERCFG] Fix some clipping. By Jared Smudde. CORE-9700
by akhaldi＠svn.reactos.org 16 May '15

16 May '15

Author: akhaldi Date: Sat May 16 09:02:29 2015 New Revision: 67753 URL: http://svn.reactos.org/svn/reactos?rev=67753&view=rev Log: [POWERCFG] Fix some clipping. By Jared Smudde. CORE-9700 Modified: trunk/reactos/dll/cpl/powercfg/lang/cs-CZ.rc trunk/reactos/dll/cpl/powercfg/lang/el-GR.rc trunk/reactos/dll/cpl/powercfg/lang/en-US.rc trunk/reactos/dll/cpl/powercfg/lang/es-ES.rc trunk/reactos/dll/cpl/powercfg/lang/he-IL.rc trunk/reactos/dll/cpl/powercfg/lang/ja-JP.rc trunk/reactos/dll/cpl/powercfg/lang/nl-NL.rc trunk/reactos/dll/cpl/powercfg/lang/no-NO.rc trunk/reactos/dll/cpl/powercfg/lang/ro-RO.rc trunk/reactos/dll/cpl/powercfg/lang/sk-SK.rc trunk/reactos/dll/cpl/powercfg/lang/sq-AL.rc trunk/reactos/dll/cpl/powercfg/lang/th-TH.rc trunk/reactos/dll/cpl/powercfg/lang/tr-TR.rc trunk/reactos/dll/cpl/powercfg/lang/zh-CN.rc Modified: trunk/reactos/dll/cpl/powercfg/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/cs-C… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/cs-CZ.rc [iso-8859-1] Sat May 16 09:02:29 2015 @@ -38,7 +38,7 @@ BEGIN GROUPBOX "VarovÃ¡nÃ o nÃzkÃ©m stavu baterie", -1, 10, 15, 235, 95 CONTROL "Aktivovat &varovÃ¡nÃ o nÃzkÃ©m stavu baterie, kdyÅ¾ ÃºroveÅ nabitÃ dosÃ¡hne:", IDC_ALARM1, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 15, 17, 190, 15 - LTEXT "neznÃ¡mÃ¡", IDC_ALARMVALUE1, 209, 20, 33, 10 + LTEXT "neznÃ¡mÃ¡", IDC_ALARMVALUE1, 215, 20, 20, 10 LTEXT "0%", -1, 28, 43, 15, 10 CONTROL "Slider1", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 45, 170, 15 LTEXT "100%", -1, 214, 43, 25, 10 @@ -51,7 +51,7 @@ LTEXT "NeznÃ¡mÃ½", IDC_ALARMPROG1, 154, 95, 84, 10 GROUPBOX "VarovÃ¡nÃ o kritickÃ©m stavu baterie", -1, 6, 120, 239, 106 CONTROL "Aktivovat varovÃ¡nÃ o &kritickÃ©m stavu baterie, kdyÅ¾ ÃºroveÅ nabitÃ dosÃ¡hne:", IDC_ALARM2, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 15, 131, 180, 15 - LTEXT "neznÃ¡mÃ¡", IDC_ALARMVALUE2, 209, 133, 33, 10 + LTEXT "neznÃ¡mÃ¡", IDC_ALARMVALUE2, 215, 134, 20, 10 LTEXT "0%", -1, 28, 154, 15, 10 CONTROL "Slider1", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 158, 170, 15 LTEXT "100%", -1, 214, 154, 25, 10 Modified: trunk/reactos/dll/cpl/powercfg/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/el-G… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/el-GR.rc [iso-8859-1] Sat May 16 09:02:29 2015 @@ -40,7 +40,7 @@ BEGIN GROUPBOX "ÎÎ¹Î´Î¿ÏÎ¿Î¯Î·ÏÎ· ÏÎµÏÎ¼ÎÎ½Î·Ï Î¼ÏÎ±ÏÎ±ÏÎ¯Î±Ï", -1, 6, 7, 239, 104 CONTROL "ÎÎ½ÎµÏÎ³Î¿ÏÎ¿Î¯Î·ÏÎ· ÎµÎ¹Î´Î¿ÏÎ¿Î¯Î·ÏÎ·Ï ÏÏÎ±Î½ Î· ÎµÎ½ÎÏÎ³ÎµÎ¹Î± ÏÏÎ¬ÏÎµÎ¹:", IDC_ALARM1, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 15, 17, 190, 15 - LTEXT "unknown", IDC_ALARMVALUE1, 209, 20, 33, 10 + LTEXT "unknown", IDC_ALARMVALUE1, 215, 20, 20, 10 LTEXT "0%", -1, 28, 43, 15, 10 CONTROL "Slider1", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 45, 170, 15 LTEXT "100%", -1, 214, 43, 25, 10 @@ -53,7 +53,7 @@ LTEXT "ÎÎ³Î½ÏÏÏÎ¿", IDC_ALARMPROG1, 154, 95, 84, 10 GROUPBOX "ÎÎ¹Î´Î¿ÏÎ¿Î¯Î·ÏÎ· ÎºÏÎ¯ÏÎ¹Î¼Î¿Ï ÏÎ·Î¼ÎµÎ¯Î¿Ï Î¼ÏÎ±ÏÎ±ÏÎ¯Î±Ï", -1, 6, 120, 239, 106 CONTROL "ÎÎ½ÎµÏÎ³Î¿ÏÎ¿Î¯Î·ÏÎ· ÎµÎ¹Î´Î¿ÏÎ¿Î¯Î·ÏÎ·Ï ÏÏÎ±Î½ Î· ÎµÎ½ÎÏÎ³ÎµÎ¹Î± ÏÏÎ¬ÏÎµÎ¹:", IDC_ALARM2, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 15, 131, 180, 15 - LTEXT "unknown", IDC_ALARMVALUE2, 209, 133, 33, 10 + LTEXT "unknown", IDC_ALARMVALUE2, 215, 134, 20, 10 LTEXT "0%", -1, 28, 154, 15, 10 CONTROL "Slider1", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 158, 170, 15 LTEXT "100%", -1, 214, 154, 25, 10 Modified: trunk/reactos/dll/cpl/powercfg/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/en-U… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/en-US.rc [iso-8859-1] Sat May 16 09:02:29 2015 @@ -38,7 +38,7 @@ BEGIN GROUPBOX "Low battery alarm", -1, 6, 7, 239, 104 CONTROL "Activate &low battery alarm when power level reaches:", IDC_ALARM1, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 15, 17, 190, 15 - LTEXT "unknown", IDC_ALARMVALUE1, 209, 20, 33, 10 + LTEXT "unknown", IDC_ALARMVALUE1, 215, 20, 20, 10 LTEXT "0%", -1, 28, 43, 15, 10 CONTROL "Slider1", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 45, 170, 15 LTEXT "100%", -1, 214, 43, 25, 10 @@ -50,8 +50,8 @@ LTEXT "Run Program:", -1, 95, 95, 55, 10 LTEXT "Unknown", IDC_ALARMPROG1, 154, 95, 84, 10 GROUPBOX "Critical battery alarm", -1, 6, 120, 239, 106 - CONTROL "Activate &critical battery alarm when power level reaches:", IDC_ALARM2, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 15, 131, 180, 15 - LTEXT "unknown", IDC_ALARMVALUE2, 209, 133, 33, 10 + CONTROL "Activate &critical battery alarm when power level reaches:", IDC_ALARM2, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 15, 131, 195, 15 + LTEXT "unknown", IDC_ALARMVALUE2, 215, 134, 20, 10 LTEXT "0%", -1, 28, 154, 15, 10 CONTROL "Slider1", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 158, 170, 15 LTEXT "100%", -1, 214, 154, 25, 10 Modified: trunk/reactos/dll/cpl/powercfg/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/es-E… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/es-ES.rc [iso-8859-1] Sat May 16 09:02:29 2015 @@ -40,7 +40,7 @@ BEGIN GROUPBOX "Alarma de baterÃa baja ", -1, 6, 7, 249, 104 CONTROL "Activar la a&larma de baterÃa baja cuando la potencia alcance un nivel:", IDC_ALARM1, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 15, 17, 190, 15 - LTEXT "Desconocido", IDC_ALARMVALUE1, 209, 20, 33, 10 + LTEXT "Desconocido", IDC_ALARMVALUE1, 215, 20, 20, 10 LTEXT "0%", -1, 28, 43, 15, 10 CONTROL "Slider1", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 45, 170, 15 LTEXT "100%", -1, 214, 43, 25, 10 @@ -53,7 +53,7 @@ LTEXT "Desconocido", IDC_ALARMPROG1, 154, 95, 84, 10 GROUPBOX "Alarma de baterÃa crÃtica ", -1, 6, 120, 249, 106 CONTROL "Activar la a&larma de baterÃa baja cuando la potencia alcance un nivel:", IDC_ALARM2, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 15, 131, 180, 15 - LTEXT "Desconocido", IDC_ALARMVALUE2, 209, 133, 33, 10 + LTEXT "Desconocido", IDC_ALARMVALUE2, 215, 134, 20, 10 LTEXT "0%", -1, 28, 154, 15, 10 CONTROL "Slider1", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 158, 170, 15 LTEXT "100%", -1, 214, 154, 25, 10 Modified: trunk/reactos/dll/cpl/powercfg/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/he-I… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/he-IL.rc [iso-8859-1] Sat May 16 09:02:29 2015 @@ -40,7 +40,7 @@ BEGIN GROUPBOX "××ª×¨××ª ×¡×××× × ××××", -1, 6, 7, 239, 104 CONTROL "××¤×¢× ××ª×¨××ª ×¡×××× × ×××× ××ª× ×©××× ××¡×××× ××××¢ ×:", IDC_ALARM1, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 15, 17, 190, 15 - LTEXT "unknown", IDC_ALARMVALUE1, 209, 20, 33, 10 + LTEXT "unknown", IDC_ALARMVALUE1, 215, 20, 20, 10 LTEXT "0%", -1, 28, 43, 15, 10 CONTROL "Slider1", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 45, 170, 15 LTEXT "100%", -1, 214, 43, 25, 10 @@ -53,7 +53,7 @@ LTEXT "Unknown", IDC_ALARMPROG1, 154, 95, 84, 10 GROUPBOX "××ª×¨××ª ×¡×××× ×§×¨××××ª", -1, 6, 120, 239, 106 CONTROL "××¤×¢× ××ª×¨××ª ×¡×××× ×§×¨××××ª ××ª× ×©××× ××¡×××× ××××¢ ×:", IDC_ALARM2, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 15, 131, 180, 15 - LTEXT "unknown", IDC_ALARMVALUE2, 209, 133, 33, 10 + LTEXT "unknown", IDC_ALARMVALUE2, 215, 134, 20, 10 LTEXT "0%", -1, 28, 154, 15, 10 CONTROL "Slider1", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 158, 170, 15 LTEXT "100%", -1, 214, 154, 25, 10 Modified: trunk/reactos/dll/cpl/powercfg/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/ja-J… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/ja-JP.rc [iso-8859-1] Sat May 16 09:02:29 2015 @@ -40,7 +40,7 @@ BEGIN GROUPBOX "ããããªä½ä¸ã¢ã©ã¼ã ", -1, 6, 7, 239, 104 CONTROL "é»æºã¬ãã«ãæ¬¡ã«éãããããããªä½ä¸ã¢ã©ã¼ã ã§ç¥ããã(&L):", IDC_ALARM1, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 15, 17, 190, 15 - LTEXT "ä¸æ", IDC_ALARMVALUE1, 209, 20, 33, 10 + LTEXT "ä¸æ", IDC_ALARMVALUE1, 215, 20, 20, 10 LTEXT "0%", -1, 28, 43, 15, 10 CONTROL "Slider1", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 45, 170, 15 LTEXT "100%", -1, 214, 43, 25, 10 @@ -53,7 +53,7 @@ LTEXT "ä¸æ", IDC_ALARMPROG1, 154, 95, 84, 10 GROUPBOX "ããããªéçã¢ã©ã¼ã ", -1, 6, 120, 239, 106 CONTROL "é»æºã¬ãã«ãæ¬¡ã«éãããããããªéçã¢ã©ã¼ã ã§ç¥ããã(&C):", IDC_ALARM2, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 15, 131, 180, 15 - LTEXT "ä¸æ", IDC_ALARMVALUE2, 209, 133, 33, 10 + LTEXT "ä¸æ", IDC_ALARMVALUE2, 215, 134, 20, 10 LTEXT "0%", -1, 28, 154, 15, 10 CONTROL "Slider1", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 158, 170, 15 LTEXT "100%", -1, 214, 154, 25, 10 Modified: trunk/reactos/dll/cpl/powercfg/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/nl-N… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/nl-NL.rc [iso-8859-1] Sat May 16 09:02:29 2015 @@ -37,8 +37,8 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Low battery alarm", -1, 10, 15, 235, 95 - CONTROL "Activate &low battery alarm when power level reaches:", IDC_ALARM1, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 15, 25, 180, 15 - LTEXT "Onbekend", IDC_ALARMVALUE1, 200, 25, 40, 10 + CONTROL "Activate &low battery alarm when power level reaches:", IDC_ALARM1, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 15, 25, 185, 15 + LTEXT "Onbekend", IDC_ALARMVALUE1, 200, 28, 40, 10 LTEXT "0%", -1, 20, 40, 15, 15 CONTROL "Slider1", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 30, 40, 170, 15 LTEXT "100%", -1, 215, 40, 25, 10 @@ -50,8 +50,8 @@ LTEXT "Run Program:", -1, 95, 90, 50, 10 LTEXT "Onbekend", IDC_ALARMPROG1, 150, 90, 40, 10 GROUPBOX "Critical battery alarm", -1, 10, 115, 235, 95 - CONTROL "Activate &low battery alarm when power level reaches:", IDC_ALARM2, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 15, 125, 180, 15 - LTEXT "Onbekend", IDC_ALARMVALUE2, 200, 125, 40, 10 + CONTROL "Activate &low battery alarm when power level reaches:", IDC_ALARM2, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 15, 125, 185, 15 + LTEXT "Onbekend", IDC_ALARMVALUE2, 200, 128, 40, 10 LTEXT "0%", -1, 20, 140, 15, 15 CONTROL "Slider1", IDC_ALARMBAR2, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 30, 140, 170, 15 LTEXT "100%", -1, 215, 140, 25, 10 Modified: trunk/reactos/dll/cpl/powercfg/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/no-N… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/no-NO.rc [iso-8859-1] Sat May 16 09:02:29 2015 @@ -40,7 +40,7 @@ BEGIN GROUPBOX "Svakt battery alarm", -1, 6, 7, 239, 104 CONTROL "Aktivere &svakt batteri alarm mens strÃ¸mnivÃ¥et passerer:", IDC_ALARM1, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 15, 17, 190, 15 - LTEXT "ukjent", IDC_ALARMVALUE1, 209, 20, 33, 10 + LTEXT "ukjent", IDC_ALARMVALUE1, 215, 20, 20, 10 LTEXT "0%", -1, 28, 43, 15, 10 CONTROL "Slider1", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 45, 170, 15 LTEXT "100%", -1, 214, 43, 25, 10 Modified: trunk/reactos/dll/cpl/powercfg/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/ro-R… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/ro-RO.rc [iso-8859-1] Sat May 16 09:02:29 2015 @@ -43,7 +43,7 @@ BEGIN GROUPBOX "AlarmÄ baterie decongestionatÄ", -1, 6, 7, 239, 104 CONTROL "AlarmeazÄ âbaterie &decongestionatÄâ cÃ¢nd se ajunge la:", IDC_ALARM1, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 15, 17, 190, 15 - LTEXT "unknown", IDC_ALARMVALUE1, 209, 20, 33, 10 + LTEXT "unknown", IDC_ALARMVALUE1, 215, 20, 20, 10 LTEXT "0%", -1, 28, 43, 15, 10 CONTROL "Slider1", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 45, 170, 15 LTEXT "100%", -1, 214, 43, 25, 10 Modified: trunk/reactos/dll/cpl/powercfg/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/sk-S… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/sk-SK.rc [iso-8859-1] Sat May 16 09:02:29 2015 @@ -46,7 +46,7 @@ BEGIN GROUPBOX "SignalizÃ¡cia vybitia batÃ©rie", -1, 6, 7, 239, 104 CONTROL "ZapnÃºÅ¥ signalizÃ¡ciu &vybitia batÃ©rie pri hodnote:", IDC_ALARM1, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 15, 17, 190, 15 - LTEXT "neznÃ¡ma", IDC_ALARMVALUE1, 209, 20, 33, 10 + LTEXT "neznÃ¡ma", IDC_ALARMVALUE1, 215, 20, 20, 10 LTEXT "0%", -1, 28, 43, 15, 10 CONTROL "Slider1", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 45, 170, 15 LTEXT "100%", -1, 214, 43, 25, 10 Modified: trunk/reactos/dll/cpl/powercfg/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/sq-A… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/sq-AL.rc [iso-8859-1] Sat May 16 09:02:29 2015 @@ -43,7 +43,7 @@ BEGIN GROUPBOX "Alarm tÃ« ulÃ«t bateri", -1, 6, 7, 239, 104 CONTROL "Aktivizo alarmin e ulÃ«t baterie kur niveli i energjisÃ« arrin:", IDC_ALARM1, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 15, 17, 190, 15 - LTEXT "i panjohur", IDC_ALARMVALUE1, 209, 20, 33, 10 + LTEXT "i panjohur", IDC_ALARMVALUE1, 215, 20, 20, 10 LTEXT "0%", -1, 28, 43, 15, 10 CONTROL "Slider1", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 45, 170, 15 LTEXT "100%", -1, 214, 43, 25, 10 Modified: trunk/reactos/dll/cpl/powercfg/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/th-T… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/th-TH.rc [iso-8859-1] Sat May 16 09:02:29 2015 @@ -38,7 +38,7 @@ BEGIN GROUPBOX "Low battery alarm", -1, 6, 7, 239, 104 CONTROL "Activate &low battery alarm when power level reaches:", IDC_ALARM1, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 15, 17, 190, 15 - LTEXT "unknown", IDC_ALARMVALUE1, 209, 20, 33, 10 + LTEXT "unknown", IDC_ALARMVALUE1, 215, 20, 20, 10 LTEXT "0%", -1, 28, 43, 15, 10 CONTROL "Slider1", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 45, 170, 15 LTEXT "100%", -1, 214, 43, 25, 10 Modified: trunk/reactos/dll/cpl/powercfg/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/tr-T… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/tr-TR.rc [iso-8859-1] Sat May 16 09:02:29 2015 @@ -40,7 +40,7 @@ BEGIN GROUPBOX "AzalmÄ±Å Pil UyarÄ±sÄ±", -1, 6, 7, 239, 104 CONTROL "&GÃ¼Ã§ dÃ¼zeyi Åuraya geldiÄinde azalmÄ±Å pil uyarÄ±sÄ±nÄ± etkinleÅtir:", IDC_ALARM1, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 15, 17, 190, 15 - LTEXT "Bilinmiyor", IDC_ALARMVALUE1, 209, 20, 33, 10 + LTEXT "Bilinmiyor", IDC_ALARMVALUE1, 215, 20, 20, 10 LTEXT "%0", -1, 28, 43, 15, 10 CONTROL "Slider1", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 45, 170, 15 LTEXT "%100", -1, 214, 43, 25, 10 Modified: trunk/reactos/dll/cpl/powercfg/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/zh-C… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/zh-CN.rc [iso-8859-1] Sat May 16 09:02:29 2015 @@ -40,7 +40,7 @@ BEGIN GROUPBOX "çµæ± ä¸è¶³è¦æ¥", -1, 6, 7, 239, 104 CONTROL "å½çµééä½å°ä»¥ä¸æ°´å¹³æ¶ï¼ååºçµæ± ä¸è¶³è¦æ¥(&L):", IDC_ALARM1, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 15, 17, 190, 15 - LTEXT "æªç¥", IDC_ALARMVALUE1, 209, 20, 33, 10 + LTEXT "æªç¥", IDC_ALARMVALUE1, 215, 20, 20, 10 LTEXT "0%", -1, 28, 43, 15, 10 CONTROL "Slider1", IDC_ALARMBAR1, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | WS_TABSTOP, 42, 45, 170, 15 LTEXT "100%", -1, 214, 43, 25, 10

1 0

[akhaldi] 67752: [APPWIZ] Remove rsrc.rc and move its content to appwiz.rc. Add a better bitmap to the create shortcut window. By Jared Smudde. CORE-9633
by akhaldi＠svn.reactos.org 16 May '15

16 May '15

Author: akhaldi Date: Sat May 16 08:59:21 2015 New Revision: 67752 URL: http://svn.reactos.org/svn/reactos?rev=67752&view=rev Log: [APPWIZ] Remove rsrc.rc and move its content to appwiz.rc. Add a better bitmap to the create shortcut window. By Jared Smudde. CORE-9633 Added: trunk/reactos/dll/cpl/appwiz/resources/shortcut.bmp (with props) Removed: trunk/reactos/dll/cpl/appwiz/rsrc.rc Modified: trunk/reactos/dll/cpl/appwiz/appwiz.rc trunk/reactos/dll/cpl/appwiz/createlink.c trunk/reactos/dll/cpl/appwiz/resource.h Modified: trunk/reactos/dll/cpl/appwiz/appwiz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/appwiz.rc [iso-8859-1] Sat May 16 08:59:21 2015 @@ -20,7 +20,67 @@ IDI_APPINETICO ICON "resources/1505.ico" IDB_WATERMARK BITMAP "resources/watermark.bmp" +IDB_SHORTCUT BITMAP "resources/shortcut.bmp" #include <reactos/manifest_dll.rc> -#include "rsrc.rc" +/* UTF-8 */ +#pragma code_page(65001) + +#ifdef LANGUAGE_BG_BG + #include "lang/bg-BG.rc" +#endif +#ifdef LANGUAGE_CS_CZ + #include "lang/cs-CZ.rc" +#endif +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif +#ifdef LANGUAGE_EL_GR + #include "lang/el-GR.rc" +#endif +#ifdef LANGUAGE_ES_ES + #include "lang/es-ES.rc" +#endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif +#ifdef LANGUAGE_NB_NO + #include "lang/no-NO.rc" +#endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif +#ifdef LANGUAGE_PT_BR + #include "lang/pt-BR.rc" +#endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif +#ifdef LANGUAGE_SK_SK + #include "lang/sk-SK.rc" +#endif +#ifdef LANGUAGE_SQ_AL + #include "lang/sq-AL.rc" +#endif +#ifdef LANGUAGE_TR_TR + #include "lang/tr-TR.rc" +#endif +#ifdef LANGUAGE_UK_UA + #include "lang/uk-UA.rc" +#endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.rc" +#endif Modified: trunk/reactos/dll/cpl/appwiz/createlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/createlink.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/createlink.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/createlink.c [iso-8859-1] Sat May 16 08:59:21 2015 @@ -379,7 +379,7 @@ psh.nPages = nPages; psh.nStartPage = 0; psh.phpage = ahpsp; - psh.pszbmWatermark = MAKEINTRESOURCEW(IDB_WATERMARK); + psh.pszbmWatermark = MAKEINTRESOURCEW(IDB_SHORTCUT); /* Display the wizard */ PropertySheet(&psh); Modified: trunk/reactos/dll/cpl/appwiz/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/resource.h?… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/resource.h [iso-8859-1] Sat May 16 08:59:21 2015 @@ -19,6 +19,7 @@ /* Bitmaps */ #define IDB_WATERMARK 5001 +#define IDB_SHORTCUT 5002 /* Strings */ #define IDS_CPLSYSTEMNAME 1001 Added: trunk/reactos/dll/cpl/appwiz/resources/shortcut.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/resources/s… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/appwiz/resources/shortcut.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Removed: trunk/reactos/dll/cpl/appwiz/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/rsrc.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/rsrc.rc (removed) @@ -1,59 +0,0 @@ -// UTF-8 -#pragma code_page(65001) -#ifdef LANGUAGE_BG_BG - #include "lang/bg-BG.rc" -#endif -#ifdef LANGUAGE_CS_CZ - #include "lang/cs-CZ.rc" -#endif -#ifdef LANGUAGE_EN_US - #include "lang/en-US.rc" -#endif -#ifdef LANGUAGE_DE_DE - #include "lang/de-DE.rc" -#endif -#ifdef LANGUAGE_EL_GR - #include "lang/el-GR.rc" -#endif -#ifdef LANGUAGE_ES_ES - #include "lang/es-ES.rc" -#endif -#ifdef LANGUAGE_FR_FR - #include "lang/fr-FR.rc" -#endif -#ifdef LANGUAGE_HE_IL - #include "lang/he-IL.rc" -#endif -#ifdef LANGUAGE_IT_IT - #include "lang/it-IT.rc" -#endif -#ifdef LANGUAGE_NB_NO - #include "lang/no-NO.rc" -#endif -#ifdef LANGUAGE_PL_PL - #include "lang/pl-PL.rc" -#endif -#ifdef LANGUAGE_PT_BR - #include "lang/pt-BR.rc" -#endif -#ifdef LANGUAGE_RO_RO - #include "lang/ro-RO.rc" -#endif -#ifdef LANGUAGE_RU_RU - #include "lang/ru-RU.rc" -#endif -#ifdef LANGUAGE_SK_SK - #include "lang/sk-SK.rc" -#endif -#ifdef LANGUAGE_SQ_AL - #include "lang/sq-AL.rc" -#endif -#ifdef LANGUAGE_TR_TR - #include "lang/tr-TR.rc" -#endif -#ifdef LANGUAGE_UK_UA - #include "lang/uk-UA.rc" -#endif -#ifdef LANGUAGE_ZH_CN - #include "lang/zh-CN.rc" -#endif

1 0

[hbelusca] 67751: Fix Mr.GCC
by hbelusca＠svn.reactos.org 15 May '15

15 May '15

Author: hbelusca Date: Fri May 15 23:16:58 2015 New Revision: 67751 URL: http://svn.reactos.org/svn/reactos?rev=67751&view=rev Log: Fix Mr.GCC Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Fri May 15 23:16:58 2015 @@ -903,7 +903,7 @@ { /* Get */ Return = GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_IDATE, - &CountryCodeBuffer->TimeFormat, + (LPSTR)&CountryCodeBuffer->TimeFormat, sizeof(CountryCodeBuffer->TimeFormat)); if (Return == 0) { @@ -913,7 +913,7 @@ } Return = GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_SCURRENCY, - &CountryCodeBuffer->CurrencySymbol, + (LPSTR)&CountryCodeBuffer->CurrencySymbol, sizeof(CountryCodeBuffer->CurrencySymbol)); if (Return == 0) { @@ -923,7 +923,7 @@ } Return = GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, - &CountryCodeBuffer->ThousandSep, + (LPSTR)&CountryCodeBuffer->ThousandSep, sizeof(CountryCodeBuffer->ThousandSep)); if (Return == 0) { @@ -933,7 +933,7 @@ } Return = GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, - &CountryCodeBuffer->DecimalSep, + (LPSTR)&CountryCodeBuffer->DecimalSep, sizeof(CountryCodeBuffer->DecimalSep)); if (Return == 0) {

1 0

[hbelusca] 67750: [NTVDM] - Simplify CurrentDirectories array usage. - We can directly use a pointer to a DOS_DATA structure stored in the guest memory. - Use the DOS data structures for CurrentDri...
by hbelusca＠svn.reactos.org 15 May '15

15 May '15

Author: hbelusca Date: Fri May 15 23:13:40 2015 New Revision: 67750 URL: http://svn.reactos.org/svn/reactos?rev=67750&view=rev Log: [NTVDM] - Simplify CurrentDirectories array usage. - We can directly use a pointer to a DOS_DATA structure stored in the guest memory. - Use the DOS data structures for CurrentDrive (in DOS_DATA) and LastDrive (this is in fact NumLocalDrives in the SYSVARS list). - Use ANSI versions of GetLocaleInfo where applicable. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] Fri May 15 23:13:40 2015 @@ -28,7 +28,7 @@ /* PRIVATE VARIABLES **********************************************************/ -/**/extern BYTE CurrentDrive;/**/ +extern PDOS_DATA DosData; /* PRIVATE FUNCTIONS **********************************************************/ @@ -575,7 +575,7 @@ } /* Fill the block */ - FindFileBlock->DriveLetter = CurrentDrive + 'A'; + FindFileBlock->DriveLetter = DosData->Sda.CurrentDrive + 'A'; FindFileBlock->AttribMask = AttribMask; FindFileBlock->SearchHandle = SearchHandle; FindFileBlock->Attributes = LOBYTE(FindData.dwFileAttributes); Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c [iso-8859-1] Fri May 15 23:13:40 2015 @@ -74,7 +74,7 @@ PDOS_DEVICE_NODE Node = DosGetDriverNode(Descriptor->DevicePointer); if (!Node->InputStatusRoutine) return FALSE; - + Result = Node->InputStatusRoutine(Node); return !(Result & DOS_DEVSTAT_BUSY); } @@ -199,7 +199,7 @@ } /* Set the drive */ - CurrentDrive = DosDirectory[0] - 'A'; + Sda->CurrentDrive = DosDirectory[0] - 'A'; /* Get the directory part of the path */ Path = strchr(DosDirectory, '\\'); @@ -212,7 +212,7 @@ /* Set the directory */ if (Path != NULL) { - strncpy(CurrentDirectories[CurrentDrive], Path, DOS_DIR_LENGTH); + strncpy(CurrentDirectories[Sda->CurrentDrive], Path, DOS_DIR_LENGTH); } /* Read CONFIG.SYS */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c [iso-8859-1] Fri May 15 23:13:40 2015 @@ -239,7 +239,7 @@ static VOID DosRemoveDriver(DWORD Driver) { - DWORD CurrentDriver = MAKELONG(FIELD_OFFSET(DOS_SYSVARS, NullDevice), DOS_DATA_SEGMENT); + DWORD CurrentDriver = MAKELONG(DOS_DATA_OFFSET(SysVars.NullDevice), DOS_DATA_SEGMENT); while (LOWORD(CurrentDriver) != 0xFFFF) { @@ -325,7 +325,7 @@ PDOS_DEVICE_NODE DosGetDevice(LPCSTR DeviceName) { - DWORD CurrentDriver = MAKELONG(FIELD_OFFSET(DOS_SYSVARS, NullDevice), DOS_DATA_SEGMENT); + DWORD CurrentDriver = MAKELONG(DOS_DATA_OFFSET(SysVars.NullDevice), DOS_DATA_SEGMENT); ANSI_STRING DeviceNameString; RtlInitAnsiString(&DeviceNameString, DeviceName); Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Fri May 15 23:13:40 2015 @@ -36,12 +36,11 @@ CALLBACK16 DosContext; -/*static*/ BYTE CurrentDrive = 0x00; -static CHAR LastDrive = 'Z'; // The last drive can be redefined with the LASTDRIVE command. At the moment, set the real maximum possible, 'Z'. -static PCHAR CurrentDirectories; - /* PUBLIC VARIABLES ***********************************************************/ +/* Global DOS data area contained in guest memory */ +PDOS_DATA DosData; +/* Easy accessors to useful DOS data area parts */ PDOS_SYSVARS SysVars; PDOS_SDA Sda; @@ -55,7 +54,7 @@ CHAR DirectoryPath[DOS_CMDLINE_LENGTH + 1]; /* Make sure the drive exists */ - if (Drive > (LastDrive - 'A')) return FALSE; + if (Drive >= SysVars->NumLocalDrives) return FALSE; RtlZeroMemory(DirectoryPath, sizeof(DirectoryPath)); @@ -63,14 +62,14 @@ snprintf(DirectoryPath, DOS_CMDLINE_LENGTH, "%c:\\%s", - Drive + 'A', - &CurrentDirectories[Drive * DOS_DIR_LENGTH]); + 'A' + Drive, + DosData->CurrentDirectories[Drive]); /* Change the current directory of the process */ if (!SetCurrentDirectoryA(DirectoryPath)) return FALSE; /* Set the current drive */ - CurrentDrive = Drive; + Sda->CurrentDrive = Drive; /* Return success */ return TRUE; @@ -98,7 +97,7 @@ DriveNumber = RtlUpperChar(Directory[0]) - 'A'; /* Make sure the drive exists */ - if (DriveNumber > (LastDrive - 'A')) + if (DriveNumber >= SysVars->NumLocalDrives) { Sda->LastErrorCode = ERROR_PATH_NOT_FOUND; return FALSE; @@ -107,7 +106,7 @@ else { /* Keep the current drive number */ - DriveNumber = CurrentDrive; + DriveNumber = Sda->CurrentDrive; } /* Get the file attributes */ @@ -122,7 +121,7 @@ } /* Check if this is the current drive */ - if (DriveNumber == CurrentDrive) + if (DriveNumber == Sda->CurrentDrive) { /* Change the directory */ if (!SetCurrentDirectoryA(Directory)) @@ -131,7 +130,7 @@ return FALSE; } } - + /* Get the (possibly new) current directory (needed if we specified a relative directory) */ if (!GetCurrentDirectoryA(sizeof(CurrentDirectory), CurrentDirectory)) { @@ -157,11 +156,11 @@ /* Set the directory for the drive */ if (Path != NULL) { - strncpy(&CurrentDirectories[DriveNumber * DOS_DIR_LENGTH], Path, DOS_DIR_LENGTH); + strncpy(DosData->CurrentDirectories[DriveNumber], Path, DOS_DIR_LENGTH); } else { - CurrentDirectories[DriveNumber * DOS_DIR_LENGTH] = '\0'; + DosData->CurrentDirectories[DriveNumber][0] = '\0'; } /* Return success */ @@ -198,8 +197,6 @@ SYSTEMTIME SystemTime; PCHAR String; PDOS_INPUT_BUFFER InputBuffer; - PDOS_COUNTRY_CODE_BUFFER CountryCodeBuffer; - INT Return; Sda->InDos++; @@ -487,7 +484,7 @@ case 0x0E: { DosChangeDrive(getDL()); - setAL(LastDrive - 'A' + 1); + setAL(SysVars->NumLocalDrives); break; } @@ -510,7 +507,7 @@ /* Get Default Drive */ case 0x19: { - setAL(CurrentDrive); + setAL(Sda->CurrentDrive); break; } @@ -582,8 +579,8 @@ PCHAR FileName = (PCHAR)SEG_OFF_TO_PTR(getDS(), getSI()); PDOS_FCB Fcb = (PDOS_FCB)SEG_OFF_TO_PTR(getES(), getDI()); BYTE Options = getAL(); - INT i; CHAR FillChar = ' '; + UINT i; if (FileName[1] == ':') { @@ -596,7 +593,7 @@ else { /* No drive number specified */ - if (Options & (1 << 1)) Fcb->DriveNumber = CurrentDrive + 1; + if (Options & (1 << 1)) Fcb->DriveNumber = Sda->CurrentDrive + 1; else Fcb->DriveNumber = 0; } @@ -811,13 +808,13 @@ /* Get Free Disk Space */ case 0x36: { - CHAR RootPath[3] = "?:\\"; + CHAR RootPath[] = "?:\\"; DWORD SectorsPerCluster; DWORD BytesPerSector; DWORD NumberOfFreeClusters; DWORD TotalNumberOfClusters; - if (getDL() == 0) RootPath[0] = 'A' + CurrentDrive; + if (getDL() == 0x00) RootPath[0] = 'A' + Sda->CurrentDrive; else RootPath[0] = 'A' + getDL() - 1; if (GetDiskFreeSpaceA(RootPath, @@ -898,14 +895,16 @@ /* Get/Set Country-dependent Information */ case 0x38: { - CountryCodeBuffer = (PDOS_COUNTRY_CODE_BUFFER)SEG_OFF_TO_PTR(getDS(), getDX()); + INT Return; + PDOS_COUNTRY_CODE_BUFFER CountryCodeBuffer = + (PDOS_COUNTRY_CODE_BUFFER)SEG_OFF_TO_PTR(getDS(), getDX()); if (getAL() == 0x00) { /* Get */ - Return = GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_IDATE, - &CountryCodeBuffer->TimeFormat, - sizeof(CountryCodeBuffer->TimeFormat) / sizeof(TCHAR)); + Return = GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_IDATE, + &CountryCodeBuffer->TimeFormat, + sizeof(CountryCodeBuffer->TimeFormat)); if (Return == 0) { Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; @@ -913,9 +912,9 @@ break; } - Return = GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SCURRENCY, - &CountryCodeBuffer->CurrencySymbol, - sizeof(CountryCodeBuffer->CurrencySymbol) / sizeof(TCHAR)); + Return = GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_SCURRENCY, + &CountryCodeBuffer->CurrencySymbol, + sizeof(CountryCodeBuffer->CurrencySymbol)); if (Return == 0) { Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; @@ -923,9 +922,9 @@ break; } - Return = GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, - &CountryCodeBuffer->ThousandSep, - sizeof(CountryCodeBuffer->ThousandSep) / sizeof(TCHAR)); + Return = GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, + &CountryCodeBuffer->ThousandSep, + sizeof(CountryCodeBuffer->ThousandSep)); if (Return == 0) { Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; @@ -933,9 +932,9 @@ break; } - Return = GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, - &CountryCodeBuffer->DecimalSep, - sizeof(CountryCodeBuffer->DecimalSep) / sizeof(TCHAR)); + Return = GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, + &CountryCodeBuffer->DecimalSep, + sizeof(CountryCodeBuffer->DecimalSep)); if (Return == 0) { Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; @@ -1278,7 +1277,7 @@ /* Get the real drive number */ if (DriveNumber == 0) { - DriveNumber = CurrentDrive; + DriveNumber = Sda->CurrentDrive; } else { @@ -1286,13 +1285,13 @@ DriveNumber--; } - if (DriveNumber <= LastDrive - 'A') + if (DriveNumber < SysVars->NumLocalDrives) { /* * Copy the current directory into the target buffer. * It doesn't contain the drive letter and the backslash. */ - strncpy(String, &CurrentDirectories[DriveNumber * DOS_DIR_LENGTH], DOS_DIR_LENGTH); + strncpy(String, DosData->CurrentDirectories[DriveNumber], DOS_DIR_LENGTH); Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; setAX(0x0100); // Undocumented, see Ralf Brown: http://www.ctyme.com/intr/rb-2933.htm } @@ -1499,7 +1498,7 @@ /* Return the DOS "list of lists" in ES:BX */ setES(DOS_DATA_SEGMENT); - setBX(FIELD_OFFSET(DOS_SYSVARS, FirstDpb)); + setBX(DOS_DATA_OFFSET(SysVars.FirstDpb)); break; } @@ -1933,7 +1932,7 @@ break; } - + default: { DPRINT1("DOS Internal System Function INT 0x2F, AH = %xh, AL = %xh NOT IMPLEMENTED!\n", @@ -1969,62 +1968,19 @@ FILE *Stream; WCHAR Buffer[256]; - /* Get a pointer to the current directory buffer */ - CurrentDirectories = (PCHAR)SEG_OFF_TO_PTR(DOS_DATA_SEGMENT, - DOS_DATA_OFFSET(CurrentDirectories)); - - /* Clear the current directory buffer */ - RtlZeroMemory(CurrentDirectories, NUM_DRIVES * DOS_DIR_LENGTH * sizeof(CHAR)); - - /* Get the current directory */ - if (!GetCurrentDirectoryA(sizeof(CurrentDirectory), CurrentDirectory)) - { - // TODO: Use some kind of default path? - return FALSE; - } - - /* Convert it to a DOS path */ - if (!GetShortPathNameA(CurrentDirectory, DosDirectory, sizeof(DosDirectory))) - { - // TODO: Use some kind of default path? - return FALSE; - } - - /* Set the drive */ - CurrentDrive = RtlUpperChar(DosDirectory[0]) - 'A'; - - /* Get the directory part of the path */ - Path = strchr(DosDirectory, '\\'); - if (Path != NULL) - { - /* Skip the backslash */ - Path++; - } - - /* Set the directory */ - if (Path != NULL) - { - strncpy(&CurrentDirectories[CurrentDrive * DOS_DIR_LENGTH], Path, DOS_DIR_LENGTH); - } - - /* Read CONFIG.SYS */ - Stream = _wfopen(DOS_CONFIG_PATH, L"r"); - if (Stream != NULL) - { - while (fgetws(Buffer, 256, Stream)) - { - // TODO: Parse the line - } - fclose(Stream); - } + /* Initialize the global DOS data area */ + DosData = (PDOS_DATA)SEG_OFF_TO_PTR(DOS_DATA_SEGMENT, 0x0000); + RtlZeroMemory(DosData, sizeof(*DosData)); /* Initialize the list of lists */ - SysVars = (PDOS_SYSVARS)SEG_OFF_TO_PTR(DOS_DATA_SEGMENT, DOS_DATA_OFFSET(SysVars)); - RtlZeroMemory(SysVars, sizeof(DOS_SYSVARS)); + SysVars = &DosData->SysVars; + RtlZeroMemory(SysVars, sizeof(*SysVars)); SysVars->FirstMcb = FIRST_MCB_SEGMENT; SysVars->FirstSft = MAKELONG(DOS_DATA_OFFSET(Sft), DOS_DATA_SEGMENT); SysVars->CurrentDirs = MAKELONG(DOS_DATA_OFFSET(CurrentDirectories), DOS_DATA_SEGMENT); + /* The last drive can be redefined with the LASTDRIVE command. At the moment, set the real maximum possible, 'Z'. */ + SysVars->NumLocalDrives = 'Z' - 'A' + 1; /* Initialize the NUL device driver */ SysVars->NullDevice.Link = 0xFFFFFFFF; @@ -2040,8 +1996,39 @@ sizeof(NullDriverRoutine)); /* Initialize the swappable data area */ - Sda = (PDOS_SDA)SEG_OFF_TO_PTR(DOS_DATA_SEGMENT, DOS_DATA_OFFSET(Sda)); - RtlZeroMemory(Sda, sizeof(DOS_SDA)); + Sda = &DosData->Sda; + RtlZeroMemory(Sda, sizeof(*Sda)); + + /* Get the current directory */ + if (!GetCurrentDirectoryA(sizeof(CurrentDirectory), CurrentDirectory)) + { + // TODO: Use some kind of default path? + return FALSE; + } + + /* Convert it to a DOS path */ + if (!GetShortPathNameA(CurrentDirectory, DosDirectory, sizeof(DosDirectory))) + { + // TODO: Use some kind of default path? + return FALSE; + } + + /* Set the drive */ + Sda->CurrentDrive = RtlUpperChar(DosDirectory[0]) - 'A'; + + /* Get the directory part of the path */ + Path = strchr(DosDirectory, '\\'); + if (Path != NULL) + { + /* Skip the backslash */ + Path++; + } + + /* Set the directory */ + if (Path != NULL) + { + strncpy(DosData->CurrentDirectories[Sda->CurrentDrive], Path, DOS_DIR_LENGTH); + } /* Set the current PSP to the system PSP */ Sda->CurrentPsp = SYSTEM_PSP; @@ -2058,6 +2045,17 @@ { /* Clear the file descriptor entry */ RtlZeroMemory(&Sft->FileDescriptors[i], sizeof(DOS_FILE_DESCRIPTOR)); + } + + /* Read CONFIG.SYS */ + Stream = _wfopen(DOS_CONFIG_PATH, L"r"); + if (Stream != NULL) + { + while (fgetws(Buffer, 256, Stream)) + { + // TODO: Parse the line + } + fclose(Stream); } #endif Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h [iso-8859-1] Fri May 15 23:13:40 2015 @@ -88,7 +88,7 @@ DWORD CurrentDirs; BYTE Reserved1[6]; BYTE NumBlockDevices; - BYTE NumLocalDrives; + BYTE NumLocalDrives; // Set by LASTDRIVE DOS_DRIVER NullDevice; BYTE NullDriverRoutine[7]; } DOS_SYSVARS, *PDOS_SYSVARS; @@ -233,12 +233,11 @@ DWORD PrevCallFrame; } DOS_SDA, *PDOS_SDA; -/* This structure is only used for DOS_DATA_OFFSET calculations */ typedef struct _DOS_DATA { DOS_SYSVARS SysVars; DOS_SDA Sda; - CHAR CurrentDirectories[NUM_DRIVES * DOS_DIR_LENGTH]; + CHAR CurrentDirectories[NUM_DRIVES][DOS_DIR_LENGTH]; BYTE Sft[ANYSIZE_ARRAY]; } DOS_DATA, *PDOS_DATA;

1 0

[aandrejevic] 67749: [NTVDM] Implement those IOCTLs (0x06 and 0x07) for files too, not just devices.
by aandrejevic＠svn.reactos.org 15 May '15

15 May '15

Author: aandrejevic Date: Fri May 15 22:29:07 2015 New Revision: 67749 URL: http://svn.reactos.org/svn/reactos?rev=67749&view=rev Log: [NTVDM] Implement those IOCTLs (0x06 and 0x07) for files too, not just devices. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c [iso-8859-1] Fri May 15 22:29:07 2015 @@ -939,21 +939,36 @@ /* Get Input Status */ case 0x06: { - if (Node == NULL) - { - Sda->LastErrorCode = ERROR_INVALID_FUNCTION; - return FALSE; - } - - if (Node->InputStatusRoutine && Node->InputStatusRoutine(Node)) - { - /* Set the length to 0xFF to mark that it's ready */ - *Length = 0xFF; + /* Check if this is a file or a device */ + if (Node) + { + /* Device*/ + + if (Node->InputStatusRoutine && Node->InputStatusRoutine(Node)) + { + /* Set the length to 0xFF to mark that it's ready */ + *Length = 0xFF; + } + else + { + /* Not ready */ + *Length = 0; + } } else { - /* Not ready */ - *Length = 0; + /* File */ + + if (Descriptor->Position < Descriptor->Size) + { + /* Set the length to 0xFF to mark that it's ready */ + *Length = 0xFF; + } + else + { + /* Not ready */ + *Length = 0; + } } return TRUE; @@ -962,21 +977,26 @@ /* Get Output Status */ case 0x07: { - if (Node == NULL) - { - Sda->LastErrorCode = ERROR_INVALID_FUNCTION; - return FALSE; - } - - if (Node->OutputStatusRoutine && Node->OutputStatusRoutine(Node)) - { - /* Set the length to 0xFF to mark that it's ready */ + /* Check if this is a file or a device */ + if (Node) + { + /* Device*/ + + if (Node->OutputStatusRoutine && Node->OutputStatusRoutine(Node)) + { + /* Set the length to 0xFF to mark that it's ready */ + *Length = 0xFF; + } + else + { + /* Not ready */ + *Length = 0; + } + } + else + { + /* Files are always ready for output */ *Length = 0xFF; - } - else - { - /* Not ready */ - *Length = 0; } return TRUE;

1 0

[aandrejevic] 67748: [NTVDM] Implement DOS IOCTLs 0x06 (Get Input Status) and 0x07 (Get Output Status).
by aandrejevic＠svn.reactos.org 15 May '15

15 May '15

Author: aandrejevic Date: Fri May 15 22:18:04 2015 New Revision: 67748 URL: http://svn.reactos.org/svn/reactos?rev=67748&view=rev Log: [NTVDM] Implement DOS IOCTLs 0x06 (Get Input Status) and 0x07 (Get Output Status). Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c [iso-8859-1] Fri May 15 22:18:04 2015 @@ -936,6 +936,52 @@ return TRUE; } + /* Get Input Status */ + case 0x06: + { + if (Node == NULL) + { + Sda->LastErrorCode = ERROR_INVALID_FUNCTION; + return FALSE; + } + + if (Node->InputStatusRoutine && Node->InputStatusRoutine(Node)) + { + /* Set the length to 0xFF to mark that it's ready */ + *Length = 0xFF; + } + else + { + /* Not ready */ + *Length = 0; + } + + return TRUE; + } + + /* Get Output Status */ + case 0x07: + { + if (Node == NULL) + { + Sda->LastErrorCode = ERROR_INVALID_FUNCTION; + return FALSE; + } + + if (Node->OutputStatusRoutine && Node->OutputStatusRoutine(Node)) + { + /* Set the length to 0xFF to mark that it's ready */ + *Length = 0xFF; + } + else + { + /* Not ready */ + *Length = 0; + } + + return TRUE; + } + /* Unsupported control code */ default: {

1 0

[pschweitzer] 67747: [NTOSKRNL] Fix symbolic names list bound check in IopCreateArcNamesCd(). Spotted by "msuhanov" CORE-9698 #resolve #comment Fixed in r67747. Thanks!
by pschweitzer＠svn.reactos.org 15 May '15

15 May '15

Author: pschweitzer Date: Fri May 15 21:08:06 2015 New Revision: 67747 URL: http://svn.reactos.org/svn/reactos?rev=67747&view=rev Log: [NTOSKRNL] Fix symbolic names list bound check in IopCreateArcNamesCd(). Spotted by "msuhanov" CORE-9698 #resolve #comment Fixed in r67747. Thanks! Modified: trunk/reactos/ntoskrnl/io/iomgr/arcname.c Modified: trunk/reactos/ntoskrnl/io/iomgr/arcname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/arcname.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/arcname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/arcname.c [iso-8859-1] Fri May 15 21:08:06 2015 @@ -253,7 +253,7 @@ for (DiskNumber = 0, EnabledDisks = 0; DiskNumber < CdRomCount; DiskNumber++) { /* Check if we have an enabled disk */ - if (SymbolicLinkList && *SymbolicLinkList != UNICODE_NULL) + if (lSymbolicLinkList && *lSymbolicLinkList != UNICODE_NULL) { /* Create its device name using first symbolic link */ RtlInitUnicodeString(&DeviceStringW, lSymbolicLinkList);

1 0

[aandrejevic] 67746: [NTVDM] Reverse the HSYNC/VSYNC polarity when it should be reversed.
by aandrejevic＠svn.reactos.org 15 May '15

15 May '15

Author: aandrejevic Date: Fri May 15 19:51:40 2015 New Revision: 67746 URL: http://svn.reactos.org/svn/reactos?rev=67746&view=rev Log: [NTVDM] Reverse the HSYNC/VSYNC polarity when it should be reversed. Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c [iso-8859-1] Fri May 15 19:51:40 2015 @@ -1393,15 +1393,21 @@ case VGA_INSTAT1_READ_COLOR: { BYTE Result = 0; + BOOLEAN Vsync = InVerticalRetrace; + BOOLEAN Hsync = InHorizontalRetrace; /* Reset the AC latch */ VgaAcLatch = FALSE; + /* Reverse the polarity, if needed */ + if (VgaMiscRegister & VGA_MISC_VSYNCP) Vsync = !Vsync; + if (VgaMiscRegister & VGA_MISC_HSYNCP) Hsync = !Hsync; + /* Set a flag if there is a vertical or horizontal retrace */ - if (InVerticalRetrace || InHorizontalRetrace) Result |= VGA_STAT_DD; + if (Vsync || Hsync) Result |= VGA_STAT_DD; /* Set an additional flag if there was a vertical retrace */ - if (InVerticalRetrace) Result |= VGA_STAT_VRETRACE; + if (Vsync) Result |= VGA_STAT_VRETRACE; /* Clear the flags */ InHorizontalRetrace = InVerticalRetrace = FALSE;

1 0

[akhaldi] 67745: [SYSDM] Simplify loading usrmgr.cpl. By Jared Smudde. CORE-9694
by akhaldi＠svn.reactos.org 15 May '15

15 May '15

Author: akhaldi Date: Fri May 15 16:47:21 2015 New Revision: 67745 URL: http://svn.reactos.org/svn/reactos?rev=67745&view=rev Log: [SYSDM] Simplify loading usrmgr.cpl. By Jared Smudde. CORE-9694 Modified: trunk/reactos/dll/cpl/sysdm/userprofile.c Modified: trunk/reactos/dll/cpl/sysdm/userprofile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/userprofile.… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/userprofile.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/userprofile.c [iso-8859-1] Fri May 15 16:47:21 2015 @@ -155,12 +155,7 @@ if (nmhdr->idFrom == IDC_USERACCOUNT_LINK && nmhdr->code == NM_CLICK) { - ShellExecute(hwndDlg, - TEXT("open"), - TEXT("rundll32.exe"), - TEXT("shell32.dll, Control_RunDLL usrmgr.cpl"), - NULL, - SW_SHOWNORMAL); + ShellExecuteW(hwndDlg, NULL, L"usrmgr.cpl", NULL, NULL, 0); } break; }

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2015