Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 65797: [GDI32] - Call NtGdiInit before initializing ourselves (ok, in ROS NtGdiInit does nothing interesting, but still do it to be call-compatible with win2k3 so everything initializes ...
by hbelusca＠svn.reactos.org 22 Dec '14

22 Dec '14

Author: hbelusca Date: Mon Dec 22 19:44:59 2014 New Revision: 65797 URL: http://svn.reactos.org/svn/reactos?rev=65797&view=rev Log: [GDI32] - Call NtGdiInit before initializing ourselves (ok, in ROS NtGdiInit does nothing interesting, but still do it to be call-compatible with win2k3 so everything initializes as it should). - Do some cleanup on process detach. Modified: trunk/reactos/win32ss/gdi/gdi32/main/dllmain.c Modified: trunk/reactos/win32ss/gdi/gdi32/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/main/dll… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/main/dllmain.c [iso-8859-1] Mon Dec 22 19:44:59 2014 @@ -18,7 +18,7 @@ */ BOOL WINAPI -DllMain ( +DllMain( HANDLE hDll, DWORD dwReason, LPVOID lpReserved) @@ -38,7 +38,7 @@ VOID WINAPI -GdiProcessSetup (VOID) +GdiProcessSetup(VOID) { hProcessHeap = GetProcessHeap(); @@ -53,36 +53,62 @@ InitializeCriticalSection(&gcsClientObjLinks); } +VOID +WINAPI +GdiProcessShutdown(VOID) +{ + DeleteCriticalSection(&gcsClientObjLinks); + RtlDeleteCriticalSection(&semLocal); +} + /* * @implemented */ BOOL WINAPI -GdiDllInitialize ( +GdiDllInitialize( HANDLE hDll, DWORD dwReason, LPVOID lpReserved) { switch (dwReason) { - case DLL_PROCESS_ATTACH: - GdiProcessSetup (); - break; + case DLL_PROCESS_ATTACH: + { + /* Don't bother us for each thread */ + // DisableThreadLibraryCalls(hDll); - case DLL_THREAD_ATTACH: - NtCurrentTeb()->GdiTebBatch.Offset = 0; - NtCurrentTeb()->GdiBatchCount = 0; - break; + /* Initialize the kernel part of GDI first */ + if (!NtGdiInit()) return FALSE; - default: - return FALSE; + /* Now initialize ourselves */ + GdiProcessSetup(); + break; + } + + case DLL_THREAD_ATTACH: + { + NtCurrentTeb()->GdiTebBatch.Offset = 0; + NtCurrentTeb()->GdiBatchCount = 0; + break; + } + + case DLL_PROCESS_DETACH: + { + /* Cleanup */ + GdiProcessShutdown(); + return TRUE; + } + + default: + return FALSE; } - // Very simple, the list will fill itself as it is needed. - if(!SetStockObjects) + /* Very simple, the list will fill itself as it is needed */ + if (!SetStockObjects) { - RtlZeroMemory( &stock_objects, NB_STOCK_OBJECTS); //Assume Ros is dirty. + RtlZeroMemory(&stock_objects, NB_STOCK_OBJECTS); // Assume ROS is dirty SetStockObjects = TRUE; }

1 0

[akhaldi] 65796: [SNDREC32] Update Chinese (zh-CN) translation. By Henry Tang Ih. CORE-8933
by akhaldi＠svn.reactos.org 22 Dec '14

22 Dec '14

Author: akhaldi Date: Mon Dec 22 19:29:44 2014 New Revision: 65796 URL: http://svn.reactos.org/svn/reactos?rev=65796&view=rev Log: [SNDREC32] Update Chinese (zh-CN) translation. By Henry Tang Ih. CORE-8933 Modified: trunk/reactos/base/applications/sndrec32/lang/zh-CN.rc Modified: trunk/reactos/base/applications/sndrec32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/zh-CN.rc [iso-8859-1] Mon Dec 22 19:29:44 2014 @@ -27,37 +27,37 @@ MENUITEM "æå¼...", ID_FILE_OPEN MENUITEM "ä¿å", ID_FILE_SAVE, GRAYED MENUITEM "å¦åä¸º...", ID_FILE_SAVEAS, GRAYED - MENUITEM "Restore...", ID_FILE_RESTORE, GRAYED - MENUITEM "Properties", ID_FILE_PROPERTIES + MENUITEM "æ¢å¤...", ID_FILE_RESTORE, GRAYED + MENUITEM "å±æ§", ID_FILE_PROPERTIES MENUITEM SEPARATOR MENUITEM "éåº", ID_FILE_EXIT END - POPUP "&Edit" + POPUP "&ç¼è¾(&E)" BEGIN - MENUITEM "&Copy", ID_EDIT_COPY - MENUITEM "&Paste Insert", ID_EDIT_PASTE, GRAYED - MENUITEM "Paste Mi&x", ID_EDIT_PASTEMIX, GRAYED + MENUITEM "å¤å¶(&C)", ID_EDIT_COPY + MENUITEM "ç²è´´æå¥(&P)", ID_EDIT_PASTE, GRAYED + MENUITEM "ç²è´´æ··å(&X)", ID_EDIT_PASTEMIX, GRAYED MENUITEM SEPARATOR - MENUITEM "&Insert File...", ID_EDIT_INSERTFILE - MENUITEM "&Mix with File...", ID_EDIT_MIXFILE + MENUITEM "æå¥æä»¶...(&I)", ID_EDIT_INSERTFILE + MENUITEM "æ··åæä»¶...(&M)", ID_EDIT_MIXFILE MENUITEM SEPARATOR - MENUITEM "Delete &Before Current Position",ID_EDIT_DELETEBEFORE, GRAYED - MENUITEM "Delete &After Current Position",ID_EDIT_DELETEAFTER, GRAYED + MENUITEM "å é¤å¨å½åä½ç½®ä¹å(&B)",ID_EDIT_DELETEBEFORE, GRAYED + MENUITEM "å é¤å¨å½åä½ç½®ä¹å(&A)",ID_EDIT_DELETEAFTER, GRAYED MENUITEM SEPARATOR - MENUITEM "A&udio Properties", ID_EDIT_AUDIOPROPS + MENUITEM "é³é¢å±æ§(&U)", ID_EDIT_AUDIOPROPS END - POPUP "Effect&s" + POPUP "ææ(&S)" BEGIN - MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL - MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL + MENUITEM "å¢å é³é(25%)(&I)", ID_EFFECTS_INCVOL + MENUITEM "åå°é³é(&D)", ID_EFFECTS_DECVOL MENUITEM SEPARATOR - MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD - MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD + MENUITEM "å¢å éåº¦ (100%)(&I)", ID_EFFECTS_INCSPD + MENUITEM "åå°éåº¦(&D)", ID_EFFECTS_DECSPD MENUITEM SEPARATOR - MENUITEM "&Add Echo", ID_EFFECTS_ECHO - MENUITEM "&Reverse", ID_EFFECTS_REVERSE + MENUITEM "æ·»å åé³(&A)", ID_EFFECTS_ECHO + MENUITEM "åé(&R)", ID_EFFECTS_REVERSE END - POPUP "å¸®å©" + POPUP "å¸®å©(&?)" BEGIN MENUITEM "å³äº...", ID_ABOUT END

1 0

[akhaldi] 65795: [TRANSLATIONS] Russian translation update by Kudratov Olimjon. CORE-8947
by akhaldi＠svn.reactos.org 22 Dec '14

22 Dec '14

Author: akhaldi Date: Mon Dec 22 19:10:42 2014 New Revision: 65795 URL: http://svn.reactos.org/svn/reactos?rev=65795&view=rev Log: [TRANSLATIONS] Russian translation update by Kudratov Olimjon. CORE-8947 Added: trunk/reactos/base/applications/cmdutils/tree/lang/ru-RU.rc (with props) trunk/reactos/base/applications/cmdutils/whoami/lang/ru-RU.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/tree/tree.rc trunk/reactos/base/applications/cmdutils/whoami/whoami.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc trunk/reactos/base/applications/network/net/lang/ru-RU.rc trunk/reactos/base/applications/osk/lang/ru-RU.rc trunk/reactos/base/setup/reactos/lang/ru-RU.rc trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc trunk/reactos/dll/win32/userenv/lang/ru-RU.rc Added: trunk/reactos/base/applications/cmdutils/tree/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/tree/lang/ru-RU.rc (added) +++ trunk/reactos/base/applications/cmdutils/tree/lang/ru-RU.rc [iso-8859-1] Mon Dec 22 19:10:42 2014 @@ -0,0 +1,14 @@ +/* Russian translation by Kudratov Olimjon (olim98(a)bk.ru) */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE "ÐÑÐ°ÑÐ¸ÑÐµÑÐºÐ¾Ðµ Ð¿ÑÐµÐ´ÑÑÐ°Ð²Ð»ÐµÐ½Ð¸Ðµ ÑÑÑÑÐºÑÑÑÑ Ð¿Ð°Ð¿Ð¾Ðº Ð¸Ð»Ð¸ Ð¿ÑÑÐ¸.\n\n\ +TREE [Ð´Ð¸ÑÐº:][Ð¿ÑÑÑ] [/F] [/A]\n\n\ +\t/F ÐÑÐ²Ð¾Ð´ Ð¸Ð¼ÐµÐ½ ÑÐ°Ð¹Ð»Ð¾Ð² Ð² ÐºÐ°Ð¶Ð´Ð¾Ð¹ Ð¿Ð°Ð¿ÐºÐµ.\n\ +\t/A ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ ÑÐ¸Ð¼Ð²Ð¾Ð»Ñ ASCII Ð²Ð¼ÐµÑÑÐ¾ ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð² Ð½Ð°ÑÐ¸Ð¾Ð½Ð°Ð»ÑÐ½ÑÑ Ð°Ð»ÑÐ°Ð²Ð¸ÑÐ¾Ð²..\n" + IDS_NO_SUBDIRECTORIES "ÐÐ¾Ð´Ð¿Ð°Ð¿ÐºÐ¸ Ð¾ÑÑÑÑÑÑÐ²ÑÑÑ" + IDS_FOLDER_PATH "Ð¡ÑÑÑÐºÑÑÑÐ° Ð¿Ð°Ð¿Ð¾Ðº\n" + IDS_VOL_SERIAL "Ð¡ÐµÑÐ¸Ð¹Ð½ÑÐ¹ Ð½Ð¾Ð¼ÐµÑ ÑÐ¾Ð¼Ð° %x:%x\n" +END Propchange: trunk/reactos/base/applications/cmdutils/tree/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/tree/tree.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/tree/tree.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/tree/tree.rc [iso-8859-1] Mon Dec 22 19:10:42 2014 @@ -20,3 +20,6 @@ #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif Added: trunk/reactos/base/applications/cmdutils/whoami/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/whoami/lang/ru-RU.rc (added) +++ trunk/reactos/base/applications/cmdutils/whoami/lang/ru-RU.rc [iso-8859-1] Mon Dec 22 19:10:42 2014 @@ -0,0 +1,58 @@ +/* Russian language resource file by Kudratov Olimjon (olim98(a)bk.ru) */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USER_HEADER "Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ðµ" + IDS_GROU_HEADER "Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ Ð³ÑÑÐ¿Ð¿Ð°Ñ" + IDS_PRIV_HEADER "Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ Ð¿ÑÐ¸Ð²Ð¸Ð»ÐµÐ³Ð¸ÑÑ" + IDS_COL_USER_NAME "ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ" + IDS_COL_GROUP_NAME "ÐÑÑÐ¿Ð¿Ð°" + IDS_COL_TYPE "Ð¢Ð¸Ð¿" + IDS_COL_SID "SID" + IDS_COL_ATTRIB "ÐÑÑÐ¸Ð±ÑÑÑ" + IDS_COL_PRIV_NAME "ÐÐ¼Ñ Ð¿ÑÐ¸Ð²Ð¸Ð»ÐµÐ³Ð¸Ð¸" + IDS_COL_DESCRIPTION "ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ" + IDS_COL_STATE "Ð¡Ð¾ÑÑÐ¾ÑÐ½Ð¸Ðµ" + IDS_TP_WELL_KNOWN_GROUP "Ð¥Ð¾ÑÐ¾ÑÐ¾ Ð¸Ð·Ð²ÐµÑÑÐ½Ð°Ñ Ð³ÑÑÐ¿Ð¿Ð°" + IDS_TP_ALIAS "ÐÑÐµÐ²Ð´Ð¾Ð½Ð¸Ð¼" + IDS_TP_LABEL "ÐÐµÑÐºÐ°" + + /* [!] important note from the programmer: the program tries to remove + the last ', ' after concatenating, so keep than in mind when translating. + + you can test your translation of these attributes by using 'whoami /groups' */ + + IDS_ATTR_GROUP_MANDATORY "ÐÐ±ÑÐ·Ð°ÑÐµÐ»ÑÐ½Ð°Ñ Ð³ÑÑÐ¿Ð¿Ð°, " + IDS_ATTR_GROUP_ENABLED_BY_DEFAULT "ÐÐºÐ»ÑÑÐµÐ½Ð° Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ, " + IDS_ATTR_GROUP_ENABLED "ÐÐºÐ»ÑÑÐµÐ½Ð½Ð°Ñ Ð³ÑÑÐ¿Ð¿Ð°, " + IDS_ATTR_GROUP_OWNER "ÐÐ»Ð°Ð´ÐµÐ»ÐµÑ Ð³ÑÑÐ¿Ð¿Ñ, " + IDS_UNKNOWN_DESCRIPTION "???" + IDS_STATE_ENABLED "ÐÐºÐ»ÑÑÐµÐ½" + IDS_STATE_DISABLED "ÐÑÐºÐ»ÑÑÐµÐ½" + IDS_ERROR_UPN "ÐÐ¨ÐÐÐÐ: ÐÐµ ÑÐ´Ð°ÐµÑÑÑ Ð¿Ð¾Ð»ÑÑÐ¸ÑÑ Ð¸Ð¼Ñ ÑÑÐ°ÑÑÐ½Ð¸ÐºÐ°-Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ (UPN), Ð¿Ð¾ÑÐºÐ¾Ð»ÑÐºÑ ÑÐµÐºÑÑÐ¸Ð¹\nÐ²Ð¾ÑÐµÐ´ÑÐ¸Ð¹ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð½Ðµ ÑÐ²Ð»ÑÐµÑÑÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¼ Ð´Ð¾Ð¼ÐµÐ½Ð°.\n" + IDS_ERROR_FQDN "ÐÐ¨ÐÐÐÐ: ÐÐµ ÑÐ´Ð°ÐµÑÑÑ Ð¿Ð¾Ð»ÑÑÐ¸ÑÑ Ð¿Ð¾Ð»Ð½Ð¾Ðµ Ð´Ð¾Ð¼ÐµÐ½Ð½Ð¾Ðµ Ð¸Ð¼Ñ (FQDN), Ð¿Ð¾ÑÐºÐ¾Ð»ÑÐºÑ ÑÐµÐºÑÑÐ¸Ð¹\nÐ²Ð¾ÑÐµÐ´ÑÐ¸Ð¹ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð½Ðµ ÑÐ²Ð»ÑÐµÑÑÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¼ Ð´Ð¾Ð¼ÐµÐ½Ð°.\n" + IDS_ERROR_VALUEXPECTED "ÐÐ¨ÐÐÐÐ: Ð£ÐºÐ°Ð·Ð°Ð½ Ð½ÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼ÑÐ¹ ÑÐ¾ÑÐ¼Ð°Ñ (/FO).\nÐÐ²ÐµÐ´Ð¸ÑÐµ ""WHOAMI /?"" Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ ÑÐ¿ÑÐ°Ð²ÐºÐ¸ Ð¿Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ.\n" + IDS_ERROR_VALUENOTALLOWED "ÐÐ¨ÐÐÐÐ: ÐÐµÐ²ÐµÑÐ½ÑÐ¹ ÑÐ¸Ð½ÑÐ°ÐºÑÐ¸Ñ. ÐÐ½Ð°ÑÐµÐ½Ð¸Ðµ '%s' Ð·Ð°Ð¿ÑÐµÑÐµÐ½Ð¾ Ð´Ð»Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ° '/fo'.\nÐÐ²ÐµÐ´Ð¸ÑÐµ ""WHOAMI /?"" Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ ÑÐ¿ÑÐ°Ð²ÐºÐ¸ Ð¿Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ.\n" + IDS_ERROR_1TIMES "ÐÐ¨ÐÐÐÐ: ÐÐµÐ²ÐµÑÐ½ÑÐ¹ ÑÐ¸Ð½ÑÐ°ÐºÑÐ¸Ñ. ÐÐ°Ð¿ÑÐµÑÐµÐ½Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ '%s' Ð±Ð¾Ð»ÐµÐµ '1' ÑÐ°Ð·(Ð°).\nÐÐ²ÐµÐ´Ð¸ÑÐµ ""WHOAMI /?"" Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ ÑÐ¿ÑÐ°Ð²ÐºÐ¸ Ð¿Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ.\n" + IDS_ERROR_INVALIDSYNTAX "ÐÐ¨ÐÐÐÐ: Ð¡Ð¸Ð½ÑÐ°ÐºÑÐ¸ÑÐµÑÐºÐ°Ñ Ð¾ÑÐ¸Ð±ÐºÐ°. \nÐÐ²ÐµÐ´Ð¸ÑÐµ ""WHOAMI /?"" Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ ÑÐ¿ÑÐ°Ð²ÐºÐ¸ Ð¿Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ.\n" + IDS_ERROR_INVALIDARG "ÐÐ¨ÐÐÐÐ: ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ Ð¸Ð»Ð¸ Ð°ÑÐ³ÑÐ¼ÐµÐ½Ñ - '%s'.\nÐÐ²ÐµÐ´Ð¸ÑÐµ ""WHOAMI /?"" Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ ÑÐ¿ÑÐ°Ð²ÐºÐ¸ Ð¿Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ.\n" + IDS_ERROR_NH_LIST "ÐÐ¨ÐÐÐÐ: ÐÐ°ÑÐ°Ð¼ÐµÑÑ /NH Ð½ÐµÐ»ÑÐ·Ñ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ñ ÑÐ¾ÑÐ¼Ð°ÑÐ¾Ð¼ LIST.\nÐÐ²ÐµÐ´Ð¸ÑÐµ ""WHOAMI /?"" Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ ÑÐ¿ÑÐ°Ð²ÐºÐ¸ Ð¿Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ.\n" + IDS_HELP "ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ:\n\ + ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÑ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾Ð± Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ðµ, Ð³ÑÑÐ¿Ð¿Ðµ Ð¸ Ð¿ÑÐ¸Ð²Ð¸Ð»ÐµÐ³Ð¸ÑÑ Ð´Ð»Ñ Ð»Ð¾ÐºÐ°Ð»ÑÐ½Ð¾ Ð²Ð¾ÑÐµÐ´ÑÐ¸Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹.\n\ + ÐÑÐ»Ð¸ Ð½Ðµ ÑÐºÐ°Ð·Ð°Ð½Ð¾ Ð°ÑÐ³ÑÐ¼ÐµÐ½ÑÐ¾Ð², ÑÐ¾ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÑ ÑÐµÐºÑÑÐ¸Ð¹ Ð´Ð¾Ð¼ÐµÐ½ Ð¸ ÑÐµÐºÑÑÐµÐ³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ (Ð´Ð¾Ð¼ÐµÐ½\Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ).\n\ +\n\ + ÐÐ¾ÑÑÑÐ¿Ð½ÑÐµ ÑÐ¾ÑÐ¼Ð°ÑÑ Ð´Ð»Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ° '/fo' - 'csv', 'list' Ð¸ 'table'.\n\ + ÐÑÐ¿Ð¾Ð»ÑÐ·ÑÐ¹ÑÐµ '/nh' ÑÑÐ¾Ð±Ñ ÑÐºÑÑÑÑ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐ¸. ÐÐ¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ Ð´Ð°Ð½Ð½ÑÐµ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑÑÑ Ð² ÑÐ°Ð±Ð»Ð¸ÑÐµ.\n\ +\n\ +Ð¡Ð¸Ð½ÑÐ°ÐºÑÐ¸Ñ:\n\ + whoami [/upn | /fqdn | /logonid] \n\ + whoami {[/user] [/groups] [/priv]} [/fo <ÑÐ¾ÑÐ¼Ð°Ñ>] [/nh] \n\ + whoami /all [/fo <ÑÐ¾ÑÐ¼Ð°Ñ>] [/nh] \n\ +\n\ +ÐÑÐ¸Ð¼ÐµÑÑ:\n\ + whoami /groups /priv /nh /fo csv \n\ + whoami /logonid \n\ + whoami \n" +END Propchange: trunk/reactos/base/applications/cmdutils/whoami/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/whoami/whoami.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/whoami/whoami.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/whoami/whoami.rc [iso-8859-1] Mon Dec 22 19:10:42 2014 @@ -7,7 +7,6 @@ #define REACTOS_STR_FILE_DESCRIPTION "whoami: display information about logged-on users" #define REACTOS_STR_INTERNAL_NAME "whoami" #define REACTOS_STR_ORIGINAL_FILENAME "whoami.exe" -#define REACTOS_STR_COMPANY_NAME "Ismael Ferreras Morezuelas" #include <reactos/version.rc> @@ -23,3 +22,6 @@ #ifdef LANGUAGE_ES_ES #include "lang/es-ES.rc" #endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc [iso-8859-1] Mon Dec 22 19:10:42 2014 @@ -121,15 +121,15 @@ STRINGTABLE BEGIN - IDS_COPY "Event Type: %s\n\ -Event Source: %s\n\ -Event Category: %s\n\ -Event ID: %s\n\ -Date: %s\n\ -Time: %s\n\ -User: %s\n\ -Computer: %s\n\ -Description:\n%s" + IDS_COPY "Ð¢Ð¸Ð¿ ÑÐ¾Ð±ÑÑÐ¸Ñ: %s\n\ +ÐÑÑÐ¾ÑÐ½Ð¸Ðº ÑÐ¾Ð±ÑÑÐ¸Ñ: %s\n\ +ÐÐ°ÑÐµÐ³Ð¾ÑÐ¸Ñ ÑÐ¾Ð±ÑÑÐ¸Ñ: %s\n\ +ID ÑÐ¾Ð±ÑÑÐ¸Ñ: %s\n\ +ÐÐ°ÑÐ°: %s\n\ +ÐÑÐµÐ¼Ñ: %s\n\ +ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ: %s\n\ +ÐÐ¾Ð¼Ð¿ÑÑÑÐµÑ: %s\n\ +ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ:\n%s" END STRINGTABLE Modified: trunk/reactos/base/applications/network/net/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/lang/ru-RU.rc [iso-8859-1] Mon Dec 22 19:10:42 2014 @@ -67,59 +67,59 @@ HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION |\n\ SHARE | START | STATISTICS | STOP | TIME | USE | NET USER | VIEW ]\n" - IDS_ACCOUNTS_FORCE_LOGOFF "Force logoff after" - IDS_ACCOUNTS_LOGOFF_SECONDS "%lu seconds" - IDS_ACCOUNTS_MIN_PW_AGE "Minimum password age (in days)" - IDS_ACCOUNTS_MAX_PW_AGE "Maximum password age (in days)" - IDS_ACCOUNTS_MIN_PW_LENGTH "Minimum password length" - IDS_ACCOUNTS_PW_HIST_LENGTH "Password history length" - IDS_ACCOUNTS_LOCKOUT_THRESHOLD "Lockout threshold" - IDS_ACCOUNTS_LOCKOUT_DURATION "Lockout duration (in minutes)" - IDS_ACCOUNTS_LOCKOUT_WINDOW "Lockout observation window (in minutes)" - IDS_ACCOUNTS_COMPUTER_ROLE "Computer role" - IDS_ACCOUNTS_PRIMARY_SERVER "Primary server" - IDS_ACCOUNTS_BACKUP_SERVER "Backup server" - IDS_ACCOUNTS_STANDALONE_SERVER "Standalone server" - IDS_ACCOUNTS_WORKSTATION "Workstation" + IDS_ACCOUNTS_FORCE_LOGOFF "ÐÑÐ¸Ð½ÑÐ´Ð¸ÑÐµÐ»ÑÐ½ÑÐ¹ Ð²ÑÑÐ¾Ð´ ÑÐµÑÐµÐ·" + IDS_ACCOUNTS_LOGOFF_SECONDS "%lu ÑÐµÐºÑÐ½Ð´" + IDS_ACCOUNTS_MIN_PW_AGE "ÐÐ¸Ð½Ð¸Ð¼Ð°Ð»ÑÐ½ÑÐ¹ ÑÑÐ¾Ðº Ð´ÐµÐ¹ÑÑÐ²Ð¸Ñ Ð¿Ð°ÑÐ¾Ð»Ñ (Ð´Ð½ÐµÐ¹)" + IDS_ACCOUNTS_MAX_PW_AGE "ÐÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑÐ½ÑÐ¹ ÑÑÐ¾Ðº Ð´ÐµÐ¹ÑÑÐ²Ð¸Ñ Ð¿Ð°ÑÐ¾Ð»Ñ (Ð´Ð½ÐµÐ¹)" + IDS_ACCOUNTS_MIN_PW_LENGTH "ÐÐ¸Ð½Ð¸Ð¼Ð°Ð»ÑÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° Ð¿Ð°ÑÐ¾Ð»Ñ" + IDS_ACCOUNTS_PW_HIST_LENGTH "ÐÐ»Ð¸Ð½Ð° Ð¸ÑÑÐ¾ÑÐ¸Ð¸ Ð¿Ð°ÑÐ¾Ð»ÐµÐ¹" + IDS_ACCOUNTS_LOCKOUT_THRESHOLD "ÐÐ»Ð¾ÐºÐ¸ÑÐ¾Ð²ÐºÐ° Ð¿Ð¾ÑÐ»Ðµ Ð¾ÑÐ¸Ð±Ð¾Ðº Ð²Ð²Ð¾Ð´Ð° Ð¿Ð°ÑÐ¾Ð»Ñ" + IDS_ACCOUNTS_LOCKOUT_DURATION "ÐÐ»Ð¸ÑÐµÐ»ÑÐ½Ð¾ÑÑÑ Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²ÐºÐ¸ (Ð¼Ð¸Ð½ÑÑ)" + IDS_ACCOUNTS_LOCKOUT_WINDOW "Ð¡Ð±ÑÐ¾Ñ ÑÑÐµÑÑÐ¸ÐºÐ° Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð¾Ðº ÑÐµÑÐµÐ· (Ð¼Ð¸Ð½ÑÑ)" + IDS_ACCOUNTS_COMPUTER_ROLE "Ð Ð¾Ð»Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ°" + IDS_ACCOUNTS_PRIMARY_SERVER "ÐÑÐ½Ð¾Ð²Ð½Ð¾Ð¹ ÑÐµÑÐ²ÐµÑ" + IDS_ACCOUNTS_BACKUP_SERVER "Ð ÐµÐ·ÐµÑÐ²Ð½ÑÐ¹ ÑÐµÑÐ²ÐµÑ" + IDS_ACCOUNTS_STANDALONE_SERVER "ÐÐ²ÑÐ¾Ð½Ð¾Ð¼Ð½ÑÐ¹ ÑÐµÑÐ²ÐµÑ" + IDS_ACCOUNTS_WORKSTATION "Ð Ð°Ð±Ð¾ÑÐ°Ñ ÑÑÐ°Ð½ÑÐ¸Ñ" - IDS_LOCALGROUP_ALIASES "Aliases for \\\\%s" - IDS_LOCALGROUP_ALIAS_NAME "Alias name" - IDS_LOCALGROUP_COMMENT "Comment" - IDS_LOCALGROUP_MEMBERS "Members" + IDS_LOCALGROUP_ALIASES "ÐÑÐµÐ²Ð´Ð¾Ð½Ð¸Ð¼Ñ Ð´Ð»Ñ \\\\%s" + IDS_LOCALGROUP_ALIAS_NAME "ÐÐ¼Ñ Ð¿ÑÐµÐ²Ð´Ð¾Ð½Ð¸Ð¼Ð°" + IDS_LOCALGROUP_COMMENT "ÐÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹" + IDS_LOCALGROUP_MEMBERS "Ð§Ð»ÐµÐ½Ñ" - IDS_USER_ACCOUNTS "User accounts for \\\\%s" - IDS_USER_NAME "User name" - IDS_USER_FULL_NAME "Full name" - IDS_USER_COMMENT "Comment" - IDS_USER_USER_COMMENT "User comment" - IDS_USER_COUNTRY_CODE "Country code" - IDS_USER_ACCOUNT_ACTIVE "Account active" - IDS_USER_ACCOUNT_EXPIRES "Account expires" - IDS_USER_PW_LAST_SET "Password last set" - IDS_USER_PW_EXPIRES "Password expires" - IDS_USER_PW_CHANGEABLE "Password changeable" - IDS_USER_PW_REQUIRED "Password required" - IDS_USER_CHANGE_PW "User may change password" - IDS_USER_WORKSTATIONS "Workstations allowed" - IDS_USER_LOGON_SCRIPT "Logon script" - IDS_USER_PROFILE "User profile" - IDS_USER_HOME_DIR "Home directory" - IDS_USER_LAST_LOGON "Last logon" - IDS_USER_LOGON_HOURS "Logon hours allowed" - IDS_USER_LOCAL_GROUPS "Local group memberships" - IDS_USER_GLOBAL_GROUPS "Global group memberships" + IDS_USER_ACCOUNTS "Ð£ÑÐµÑÐ½ÑÐµ Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹ Ð´Ð»Ñ \\\\%s" + IDS_USER_NAME "ÐÐ¼Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ" + IDS_USER_FULL_NAME "ÐÐ¾Ð»Ð½Ð¾Ðµ Ð¸Ð¼Ñ" + IDS_USER_COMMENT "ÐÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹" + IDS_USER_USER_COMMENT "ÐÐ¾Ð¼Ð¼ÐµÐ½ÑÐ°ÑÐ¸Ð¹ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ" + IDS_USER_COUNTRY_CODE "ÐÐ¾Ð´ ÑÑÑÐ°Ð½Ñ" + IDS_USER_ACCOUNT_ACTIVE "Ð£ÑÐµÑÐ½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑ Ð°ÐºÑÐ¸Ð²Ð½Ð°" + IDS_USER_ACCOUNT_EXPIRES "Ð£ÑÐµÑÐ½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑ Ð¿ÑÐ¾ÑÑÐ¾ÑÐµÐ½Ð°" + IDS_USER_PW_LAST_SET "ÐÐ¾ÑÐ»ÐµÐ´Ð½Ð¸Ð¹ Ð¿Ð°ÑÐ¾Ð»Ñ Ð·Ð°Ð´Ð°Ð½" + IDS_USER_PW_EXPIRES "ÐÐµÐ¹ÑÑÐ²Ð¸Ðµ Ð¿Ð°ÑÐ¾Ð»Ñ Ð·Ð°Ð²ÐµÑÑÐ°ÐµÑÑÑ" + IDS_USER_PW_CHANGEABLE "ÐÐ°ÑÐ¾Ð»Ñ Ð´Ð¾Ð¿ÑÑÐºÐ°ÐµÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ" + IDS_USER_PW_REQUIRED "Ð¢ÑÐµÐ±ÑÐµÑÑÑ Ð¿Ð°ÑÐ¾Ð»Ñ" + IDS_USER_CHANGE_PW "ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð¼Ð¾Ð¶ÐµÑ Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑ Ð¿Ð°ÑÐ¾Ð»Ñ" + IDS_USER_WORKSTATIONS "Ð Ð°Ð·ÑÐµÑÐµÐ½Ð½ÑÐµ ÑÐ°Ð±Ð¾ÑÐ¸Ðµ ÑÑÐ°Ð½ÑÐ¸Ð¸" + IDS_USER_LOGON_SCRIPT "Ð¡ÑÐµÐ½Ð°ÑÐ¸Ð¹ Ð²ÑÐ¾Ð´Ð°" + IDS_USER_PROFILE "ÐÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ" + IDS_USER_HOME_DIR "ÐÑÐ½Ð¾Ð²Ð½Ð¾Ð¹ ÐºÐ°ÑÐ°Ð»Ð¾Ð³" + IDS_USER_LAST_LOGON "ÐÐ¾ÑÐ»ÐµÐ´Ð½Ð¸Ð¹ Ð²ÑÐ¾Ð´" + IDS_USER_LOGON_HOURS "Ð Ð°Ð·ÑÐµÑÐµÐ½Ð½ÑÐµ ÑÐ°ÑÑ Ð²ÑÐ¾Ð´Ð°" + IDS_USER_LOCAL_GROUPS "Ð§Ð»ÐµÐ½ÑÑÐ²Ð¾ Ð² Ð»Ð¾ÐºÐ°Ð»ÑÐ½ÑÑ Ð³ÑÑÐ¿Ð¿Ð°Ñ" + IDS_USER_GLOBAL_GROUPS "Ð§Ð»ÐµÐ½ÑÑÐ²Ð¾ Ð² Ð³Ð»Ð¾Ð±Ð°Ð»ÑÐ½ÑÑ Ð³ÑÑÐ¿Ð¿Ð°Ñ" - IDS_USER_ENTER_PASSWORD1 "Enter a new password for the user: " - IDS_USER_ENTER_PASSWORD2 "Enter the password again: " - IDS_USER_NO_PASSWORD_MATCH "The passwords do not match!" + IDS_USER_ENTER_PASSWORD1 "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð¿Ð°ÑÐ¾Ð»Ñ Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ: " + IDS_USER_ENTER_PASSWORD2 "ÐÐ¾Ð²ÑÐ¾ÑÐ¸ÑÐµ Ð²Ð²Ð¾Ð´ Ð¿Ð°ÑÐ¾Ð»Ñ Ð´Ð»Ñ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ñ: " + IDS_USER_NO_PASSWORD_MATCH "ÐÐ°ÑÐ¾Ð»Ð¸ Ð½Ðµ ÑÐ¾Ð²Ð¿Ð°Ð´Ð°ÑÑ!" - IDS_GENERIC_YES "Yes" - IDS_GENERIC_NO "No" - IDS_GENERIC_NEVER "Never" - IDS_GENERIC_NONE "None" - IDS_GENERIC_ALL "All" - IDS_GENERIC_LOCKED "Locked" + IDS_GENERIC_YES "ÐÐ°" + IDS_GENERIC_NO "ÐÐµÑ" + IDS_GENERIC_NEVER "ÐÐ¸ÐºÐ¾Ð³Ð´Ð°" + IDS_GENERIC_NONE "ÐÐµÑ" + IDS_GENERIC_ALL "ÐÑÐµ" + IDS_GENERIC_LOCKED "ÐÐ°Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°Ð½Ð¾" - IDS_ERROR_OPTION_NOT_SUPPORTED "The %s option is not supported yet.\n" - IDS_ERROR_INVALID_OPTION_VALUE "You entered an invalid value for the %s option.\n" + IDS_ERROR_OPTION_NOT_SUPPORTED "ÐÐ¿ÑÐ¸Ñ %s Ð² Ð´Ð°Ð½Ð½ÑÐ¹ Ð¼Ð¾Ð¼ÐµÐ½Ñ Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑÑÑ.\n" + IDS_ERROR_INVALID_OPTION_VALUE "ÐÑ Ð²Ð²ÐµÐ»Ð¸ Ð½ÐµÐ²ÐµÑÐ½ÑÐ¹ Ð´Ð°Ð½Ð½ÑÐµ Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ Ð¾Ð¿ÑÐ¸Ð¸ %s.\n" END Modified: trunk/reactos/base/applications/osk/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/osk/lang… ============================================================================== --- trunk/reactos/base/applications/osk/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/osk/lang/ru-RU.rc [iso-8859-1] Mon Dec 22 19:10:42 2014 @@ -1,5 +1,5 @@ /* - * PROJECT: ReactOS Kernel + * PROJECT: ReactOS On-Screen Keyboard * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/osk/lang/ru-RU.rc * PURPOSE: On screen keyboard (Russian resources) @@ -9,7 +9,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 -CAPTION "ÐÐ»Ð°Ð²Ð¸Ð°ÑÑÑÐ° Ð²Ð¸Ð·ÑÐ°Ð»ÑÐ½ÑÐ¹" +CAPTION "ÐÐºÑÐ°Ð½Ð½Ð°Ñ ÐºÐ»Ð°Ð²Ð¸Ð°ÑÑÑÐ°" FONT 8, "MS Shell Dlg" EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE BEGIN Modified: trunk/reactos/base/setup/reactos/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/ru… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/ru-RU.rc [iso-8859-1] Mon Dec 22 19:10:42 2014 @@ -140,8 +140,8 @@ IDS_PROCESSSUBTITLE "Ð¡Ð¾Ð·Ð´Ð°Ð½Ð¸Ðµ ÑÐ°Ð·Ð´ÐµÐ»Ð° Ð½Ð° Ð´Ð¸ÑÐºÐµ, ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ ÑÐ°Ð¹Ð»Ð¾Ð², ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ° Ð·Ð°Ð³ÑÑÐ·ÑÐ¸ÐºÐ°" IDS_RESTARTTITLE "ÐÐµÑÐ²ÑÐ¹ ÑÑÐ°Ð¿ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸ Ð·Ð°ÐºÐ¾Ð½ÑÐµÐ½" IDS_RESTARTSUBTITLE "ÐÐµÑÐ²ÑÐ¹ ÑÑÐ°Ð¿ Ð·Ð°ÐºÐ¾Ð½ÑÐµÐ½, Ð´Ð»Ñ Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ ÑÑÐµÐ±ÑÐµÑÑÑ Ð¿ÐµÑÐµÐ·Ð°Ð³ÑÑÐ·ÐºÐ°" - IDS_SUMMARYTITLE "Installation Summary" - IDS_SUMMARYSUBTITLE "List installation properties to check before apply to the installation device" + IDS_SUMMARYTITLE "Ð¡Ð²Ð¾Ð´ÐºÐ°" + IDS_SUMMARYSUBTITLE "ÐÑÐ¾Ð²ÐµÑÑÑÐµ ÑÐ¿Ð¸ÑÐ¾Ðº Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð² Ð¿ÐµÑÐµÐ´ Ð½Ð°ÑÐ°Ð»Ð¾Ð¼ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸" IDS_ABORTSETUP "ReactOS ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½ Ð½Ð° ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ Ð½Ðµ Ð¿Ð¾Ð»Ð½Ð¾ÑÑÑÑ. ÐÑÐ»Ð¸ Ð²Ñ Ð·Ð°ÐºÑÐ¾ÐµÑÐµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸ ÑÐµÐ¹ÑÐ°Ñ, Ð² Ð´Ð°Ð»ÑÐ½ÐµÐ¹ÑÐµÐ¼ Ð²Ð°Ð¼ Ð¿ÑÐ¸Ð´ÐµÑÑÑ Ð¿Ð¾Ð²ÑÐ¾ÑÐ¸ÑÑ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÑ ReactOS. ÐÑ ÑÐ²ÐµÑÐµÐ½Ñ, ÑÑÐ¾ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼Ð¾ Ð¿ÑÐµÑÐ²Ð°ÑÑ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÑ?" IDS_ABORTSETUP2 "ÐÑÐµÑÐ²Ð°ÑÑ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÑ?" END Modified: trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] Mon Dec 22 19:10:42 2014 @@ -103,9 +103,9 @@ CAPTION "ÐÐ¾Ð¿Ð¸Ñ ÐÑÐ¾ÑÐ¸Ð»Ñ" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Ð¸Ð·:", IDC_STATIC, 5, 10, 20, 8 + LTEXT "ÐÐ·:", IDC_STATIC, 5, 10, 20, 8 LTEXT "", IDC_COPYPROFILEFROM, 30, 10, 160, 10 - LTEXT "Ð²:", IDC_STATIC, 5, 30, 20, 8 + LTEXT "Ð:", IDC_STATIC, 5, 30, 20, 8 EDITTEXT IDC_COPYPROFILETO, 30, 30, 160, 12 DEFPUSHBUTTON "&ÐÐ", IDOK, 199, 9, 50, 14 PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 199, 30, 50, 14 @@ -116,9 +116,9 @@ CAPTION "ÐÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°ÑÑ Ð¿ÑÐ¾ÑÐ¸Ð»Ñ" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ÐÐ:", IDC_STATIC, 5, 10, 20, 8 + LTEXT "ÐÐ·:", IDC_STATIC, 5, 10, 20, 8 LTEXT "", IDC_RENPROFEDITFROM, 30, 10, 160, 10 - LTEXT "Ð²:", IDC_STATIC, 5, 30, 20, 8 + LTEXT "Ð:", IDC_STATIC, 5, 30, 20, 8 EDITTEXT IDC_RENPROFEDITTO, 30, 30, 160, 12 DEFPUSHBUTTON "OK", IDOK, 199, 9, 50, 14 PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 199, 30, 50, 14 @@ -145,7 +145,7 @@ IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ÐÐ°Ð³ÑÑÐ·ÐºÐ° Ð¸ Ð²Ð¾ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ" +CAPTION "ÐÐ°Ð³ÑÑÐ·ÐºÐ° Ð¸ Ð²Ð¾ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "ÐÐ°Ð³ÑÑÐ·ÐºÐ° Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½Ð¾Ð¹ ÑÐ¸ÑÑÐµÐ¼Ñ", IDC_STATIC, 7, 12, 238, 95 @@ -156,7 +156,7 @@ CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 LTEXT "ÑÐµÐºÑÐ½Ð´", IDC_STATIC, 213, 56, 25, 8 - AUTOCHECKBOX "ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑ &Ð²Ð°ÑÐ¸Ð°Ð½ÑÑ Ð²Ð¾ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ:", IDC_STRRECREC, 14, 70, 163, 8 + AUTOCHECKBOX "ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑ &Ð²Ð°ÑÐ¸Ð°Ð½ÑÑ Ð²Ð¾ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ:", IDC_STRRECREC, 14, 70, 163, 8 EDITTEXT IDC_STRRECRECEDIT, 179, 68, 30, 12, ES_NUMBER CONTROL "", IDC_STRRECRECUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 @@ -210,7 +210,7 @@ IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ÐÐµÑÐµÐ¼Ð½Ð½ÑÐµ ÑÑÐµÐ´Ñ" +CAPTION "ÐÐµÑÐµÐ¼ÐµÐ½Ð½ÑÐµ ÑÑÐµÐ´Ñ" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "ÐÐµÑÐµÐ¼ÐµÐ½Ð½ÑÐµ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ", IDC_STATIC, 7, 12, 238, 100 @@ -262,7 +262,7 @@ IDS_VARIABLE "ÐÐµÑÐµÐ¼ÐµÐ½Ð½Ð°Ñ" IDS_VALUE "ÐÐ½Ð°ÑÐµÐ½Ð¸Ðµ" IDS_NO_DUMP "(Ð½ÐµÑ)" - IDS_MINI_DUMP "ÐÐ°Ð»ÑÐ¹ Ð´Ð°Ð¼Ð¿(64ÐÐ±)" + IDS_MINI_DUMP "ÐÐ°Ð»ÑÐ¹ Ð´Ð°Ð¼Ð¿ (64ÐÐ±)" IDS_KERNEL_DUMP "ÐÐ°Ð¼Ð¿ ÑÐ´ÑÐ°" IDS_FULL_DUMP "ÐÐ¾Ð»Ð½ÑÐ¹ Ð´Ð°Ð¼Ð¿" IDS_USERPROFILE_NAME "ÐÐ¼Ñ" @@ -277,6 +277,6 @@ IDS_WARNMAXIMUMRANGE "ÐÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑÐ½ÑÐ¹ ÑÐ°Ð·Ð¼ÐµÑ ÑÐ°Ð¹Ð»Ð° Ð¿Ð¾Ð´ÐºÐ°ÑÐºÐ¸ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±ÑÑÑ Ð½Ðµ Ð¼ÐµÐ½ÑÑÐµ, ÑÐµÐ¼ Ð½Ð°ÑÐ°Ð»ÑÐ½ÑÐ¹ ÑÐ°Ð·Ð¼ÐµÑ, ÐºÐ¾ÑÐ¾ÑÑÐ¹ Ð½Ðµ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð¿ÑÐµÐ²ÑÑÐ°ÑÑ ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð¼ÐµÑÑÐ° Ð½Ð° Ð²ÑÐ±ÑÐ°Ð½Ð½Ð¾Ð¼ Ð´Ð¸ÑÐºÐµ." IDS_PAGEFILE_NONE "none" IDS_PAGEFILE_SYSTEM "system managed" - IDS_INFOREBOOT "You have to reboot the computer, in order to apply the changes." + IDS_INFOREBOOT "ÐÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼Ð¾ Ð¿ÐµÑÐµÐ·Ð°Ð³ÑÑÐ·Ð¸ÑÑ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ Ð´Ð»Ñ Ð¿ÑÐ¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹." IDS_DEVS "\nÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS\n\nÐÐ¾Ð¾ÑÐ´Ð¸Ð½Ð°ÑÐ¾Ñ Ð¿ÑÐ¾ÐµÐºÑÐ°\n\nÐÐ»ÐµÐºÑÐµÐ¹ ÐÑÐ°Ð³Ð¸Ð½\n\nÐÐ¾Ð»Ð»ÐµÐºÑÐ¸Ð² ÑÐ°Ð·ÑÐ°Ð±Ð¾ÑÑÐ¸ÐºÐ¾Ð²\n\nÐÐ»ÐµÐºÑÐµÐ¹ ÐÑÐ°Ð³Ð¸Ð½\nÐÐ½Ð´ÑÑ ÐÑÐ¸Ð½Ð²ÑÐ´\nÐÐ½Ð´ÑÐµÐ¹ ÐÐ¾ÑÐ¾ÑÐ°ÐµÐ²\nÐÑÑ ÐÐµÑÐºÑ\nÐÑÐ¸ÑÑÐ¾Ñ ÑÐ¾Ð½ ÐÐ¸ÑÑÐ¸Ñ\nÐÐ¾Ð»Ð¸Ð½ Ð¤Ð¸Ð½Ðº\nÐÐ°Ð½Ð¸ÑÐ»Ñ Ð Ð°Ð¹Ð¼ÐµÑ\nÐÐ¼Ð¸ÑÑÐ¸Ð¹ Ð§Ð°Ð¿ÑÑÐµÐ²\nÐÑÐ¸Ðº ÐÐ¾Ð»Ñ\nÐÐµÐ´ ÐÑÑÑÐ¸\nÐÑÐµÐ³Ð¾Ñ ÐÑÑÐ½Ð¼Ð°Ñ\nÐÑÐ²Ðµ ÐÐ¾ÑÑÐ¸Ð½Ð¾\nÐÐ¶ÐµÐ¹Ð¼Ñ Ð¢ÑÐ±Ð¾Ñ\nÐÐ¶ÐµÑÑÑÐ¸ ÐÐ¾ÑÐ»Ð°Ð½\nÐÐ¾ÑÐ°Ð½Ð½ÐµÑ ÐÐ½Ð´ÐµÑÐ²Ð°Ð»ÑÐ´\nKamil HornÃÄek\nKJK::ÐÐ¸Ð¿ÐµÑÐ¸Ð¾Ð½\nÐÐ°Ð°ÑÑÐµÐ½ ÐÐ¾ÑÐ¼Ð°\nÐÐ°Ð³Ð½ÑÑ ÐÐ»ÑÐµÐ½\nÐÐ°ÑÐº ÐÐ¸ÑÐ»Ð°ÑÑ\nÐÐ°ÑÑÐ¸Ð°Ñ ÐÑÐ¿ÑÐµÑ\nÐÐ°Ð¹Ðº ÐÐ¾ÑÐ´ÐµÐ»Ð»\nÐÐ¸ÑÐµÑ ÐÐ°ÑÐ´\nÐÑÐµÑ Ð¨Ð²ÐµÐ¹ÑÐµÑ\nÐ¡Ð°Ð²ÐµÐ»Ð¸Ð¹ Ð¢ÑÐµÑÑÑÐºÐ¾Ð²\nÐ¡ÑÐµÑÐ°Ð½ ÐÐ¸Ð½ÑÐ±ÐµÑÐ³\nÐ¡Ð¸Ð»ÑÐ²ÐµÐ¹Ð½ ÐÐµÑÑÐµÐ¾Ð»Ñ\nÐ¢Ð¾Ð¼Ð°Ñ ÐÐ»ÑÐ¼ÐµÐ»Ñ\nÐ¢Ð¸Ð¼Ð¾ ÐÑÐ¾Ð¹ÑÐµÑ\n\nÐÐ»ÐµÐºÑ ÐÐ¾Ð½ÐµÑÐºÑ\nÐ¤Ð¸Ð»Ð¸Ð¿ ÐÐ°Ð²Ð°ÑÐ°\nÐÑÐ½Ð½Ð°Ñ ÐÐ°Ð»ÑÐ½ÐµÑ\nÐÐ°ÑÑÐ¸Ð½ Ð¤ÑÐºÑ\nÐ Ð¾Ð¹Ñ ÐÐ¸ÑÑÐµÐ»Ð» III\nÐÑÑÐ½Ð´Ð¾Ð½ Ð¢ÑÑÐ½ÐµÑ\nÐÑÐ°Ð¹Ð°Ð½ ÐÐ°Ð»Ð¼ÐµÑ\nÐÐ°ÑÐ¿ÐµÑ Ð¥Ð¾ÑÐ½ÑÑÑÑÐ¿\nÐÑÐ²Ð¸Ð´ ÐÐµÐ»Ñ\nÐÐ¼Ð°Ð½ÑÑÐ»Ñ ÐÐ»Ð¸Ð±ÐµÑÑÐ¸\nÐÐµ Ð²Ð°Ð½ ÐÐµÐ»ÑÐ´Ð¾ÑÐ¿\nÐÑÐµÐ³Ð¾Ñ ÐÐ½Ð¸Ñ\nÐÐ¶ÐµÐ¹ÑÐ¾Ð½ Ð¤Ð¸Ð»Ð±Ð¸\nÐÐµÐ½Ñ ÐÐ¾Ð»Ð»Ð¸Ð½\nÐÐ¸ÑÐ°ÑÐ»Ñ ÐÐ¸ÑÑ\nÐÐ°ÑÐ°Ð½ ÐÑÐ´Ñ\nÐ Ð¾Ð±ÐµÑÑ ÐÐ¸ÐºÐµÐ½ÑÐ¾Ð½\nÐ ÐµÐºÑ ÐÐ¶Ð¾Ð»Ð»Ð¸ÑÑ\nVizzini\n\nÐ ÐµÐ»Ð¸Ð·-Ð¸Ð½Ð¶ÐµÐ½ÐµÑÑ\n\nÐÐ¾Ð»Ð¸Ð½ Ð¤Ð¸Ð½Ðº\nÐ¦Ð·ÑÐ»ÑÐ½ ÐÑÐ¾\n\nÐ Ð°Ð·ÑÐ°Ð±Ð¾ÑÐºÐ° Ð²ÐµÐ±-ÑÐ°Ð¹ÑÐ°\n\nÐÐ¾Ð»Ð¸Ð½ Ð¤Ð¸Ð½Ðº\nÐ¯Ð½ ÐÐ»ÑÐ¼ÐºÐ²Ð¸ÑÑ ÐÐ¸Ð½Ð°Ð½Ð´ÐµÑ\nÐÐ»ÐµÐ¼ÐµÐ½Ñ Ð¤ÑÐ¸Ð´Ð»\nÐ¦Ð·ÑÐ»ÑÐ½ ÐÑÐ¾\n\nÐÑÐ°ÑÐ¸ÑÐµÑÐºÐ¸Ð¹ Ð´Ð¸Ð·Ð°Ð¹Ð½\n\nMindflyer\nWierd_W\n\nÐÐ»Ð°Ð³Ð¾Ð´Ð°ÑÐ½Ð¾ÑÑÐ¸\n\nÐ²ÑÐµÐ¼ ÑÑÐ°ÑÑÐ½Ð¸ÐºÐ°Ð¼ Ð¿ÑÐ¾ÐµÐºÑÐ°\nÐÐ¾Ð¼Ð°Ð½Ð´Ðµ Wine\n\n" END Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Mon Dec 22 19:10:42 2014 @@ -726,8 +726,8 @@ IDS_RECENT "ÐÐµÐ´Ð°Ð²Ð½ÐµÐµ" IDS_SENDTO "ÐÑÐ¿ÑÐ°Ð²Ð¸ÑÑ" IDS_STARTMENU "ÐÐ»Ð°Ð²Ð½Ð¾Ðµ Ð¼ÐµÐ½Ñ" - IDS_MYMUSIC "ÐÐ¾Ñ Ð¼ÑÐ·ÑÐºÐ°" - IDS_MYVIDEO "ÐÐ¾Ð¸ Ð²Ð¸Ð´ÐµÐ¾Ð·Ð°Ð¿Ð¸ÑÐ¸" + IDS_MYMUSIC "ÐÐ¾Ð¸ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÑ\\ÐÐ¾Ñ Ð¼ÑÐ·ÑÐºÐ°" + IDS_MYVIDEO "ÐÐ¾Ð¸ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÑ\\ÐÐ¾Ð¸ Ð²Ð¸Ð´ÐµÐ¾Ð·Ð°Ð¿Ð¸ÑÐ¸" IDS_DESKTOPDIRECTORY "Ð Ð°Ð±Ð¾ÑÐ¸Ð¹ ÑÑÐ¾Ð»" IDS_NETHOOD "Ð¡ÐµÑÐµÐ²Ð¾Ðµ Ð¾ÐºÑÑÐ¶ÐµÐ½Ð¸Ðµ" IDS_TEMPLATES "Ð¨Ð°Ð±Ð»Ð¾Ð½Ñ" @@ -738,7 +738,7 @@ IDS_COOKIES "Cookies" IDS_HISTORY "Local Settings\\History" IDS_PROGRAM_FILES "Program Files" - IDS_MYPICTURES "ÐÐ¾Ð¸ ÑÐ¸ÑÑÐ½ÐºÐ¸" + IDS_MYPICTURES "ÐÐ¾Ð¸ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÑ\\ÐÐ¾Ð¸ ÑÐ¸ÑÑÐ½ÐºÐ¸" IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files" IDS_COMMON_DOCUMENTS "ÐÐ±ÑÐ¸Ðµ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÑ" IDS_ADMINTOOLS "ÐÐ»Ð°Ð²Ð½Ð¾Ðµ Ð¼ÐµÐ½Ñ\\ÐÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ\\ÐÐ´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ" Modified: trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc [iso-8859-1] Mon Dec 22 19:10:42 2014 @@ -47,7 +47,7 @@ LTEXT "&ÐÐ¼Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ°:", IDC_STATIC, 54, 38, 75, 8 EDITTEXT IDC_COMPUTERNAME, 165, 35, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 - LTEXT "ÐÑÐ¸ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐµ Ð±ÑÐ´ÐµÑ ÑÐ¾Ð·Ð´Ð°Ð½ Ð¿ÑÐ¾ÑÐ¸Ð»Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ Administrator ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ ÑÑÐ¾Ñ Ð¿ÑÐ¾ÑÐ¸Ð»Ñ, ÐµÑÐ»Ð¸ Ð²Ð°Ð¼ Ð½ÑÐ¶Ð½Ð¾ Ð¿Ð¾Ð»ÑÑÐ¸ÑÑ Ð¿ÑÐ°Ð²Ð° Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÐ°.", IDC_STATIC, 54, 57, 250, 25 + LTEXT "ÐÑÐ¸ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐµ Ð±ÑÐ´ÐµÑ ÑÐ¾Ð·Ð´Ð°Ð½ Ð¿ÑÐ¾ÑÐ¸Ð»Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ Administrator. ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ ÑÑÐ¾Ñ Ð¿ÑÐ¾ÑÐ¸Ð»Ñ, ÐµÑÐ»Ð¸ Ð²Ð°Ð¼ Ð½ÑÐ¶Ð½Ð¾ Ð¿Ð¾Ð»ÑÑÐ¸ÑÑ Ð¿ÑÐ°Ð²Ð° Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÐ°.", IDC_STATIC, 54, 57, 250, 25 LTEXT "ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð¿Ð°ÑÐ¾Ð»Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÐ° (Ð½Ðµ Ð±Ð¾Ð»ÐµÐµ 127 ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð²).", IDC_STATIC, 54, 87, 250, 8 LTEXT "&ÐÐ°ÑÐ¾Ð»Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÐ°:", IDC_STATIC, 54, 104, 96, 8 EDITTEXT IDC_ADMINPASSWORD1, 165, 101, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD Modified: trunk/reactos/dll/win32/userenv/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/ru-RU.rc [iso-8859-1] Mon Dec 22 19:10:42 2014 @@ -8,17 +8,17 @@ IDS_FAVORITES "ÐÐ·Ð±ÑÐ°Ð½Ð½Ð¾Ðµ" IDS_STARTMENU "ÐÐ»Ð°Ð²Ð½Ð¾Ðµ Ð¼ÐµÐ½Ñ" IDS_PROGRAMS "ÐÐ»Ð°Ð²Ð½Ð¾Ðµ Ð¼ÐµÐ½Ñ\\ÐÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ" - IDS_ADMINTOOLS "ÐÐ»Ð°Ð²Ð½Ð¾Ðµ Ð¼ÐµÐ½Ñ\\ÐÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ\\Ð¡Ð»ÑÐ¶ÐµÐ±Ð½ÑÐµ" + IDS_ADMINTOOLS "ÐÐ»Ð°Ð²Ð½Ð¾Ðµ Ð¼ÐµÐ½Ñ\\ÐÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ\\ÐÐ´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ" IDS_STARTUP "ÐÐ»Ð°Ð²Ð½Ð¾Ðµ Ð¼ÐµÐ½Ñ\\ÐÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ\\ÐÐ²ÑÐ¾Ð·Ð°Ð¿ÑÑÐº" IDS_MYDOCUMENTS "ÐÐ¾Ð¸ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÑ" IDS_MYPICTURES "ÐÐ¾Ð¸ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÑ\\ÐÐ¾Ð¸ ÑÐ¸ÑÑÐ½ÐºÐ¸" IDS_MYMUSIC "ÐÐ¾Ð¸ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÑ\\ÐÐ¾Ñ Ð¼ÑÐ·ÑÐºÐ°" IDS_MYVIDEOS "ÐÐ¾Ð¸ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÑ\\ÐÐ¾Ð¸ Ð²Ð¸Ð´ÐµÐ¾Ð·Ð°Ð¿Ð¸ÑÐ¸" IDS_TEMPLATES "Ð¨Ð°Ð±Ð»Ð¾Ð½Ñ" - IDS_RECENT "Recent" + IDS_RECENT "ÐÐµÐ´Ð°Ð²Ð½ÐµÐµ" IDS_SENDTO "ÐÑÐ¿ÑÐ°Ð²Ð¸ÑÑ" - IDS_PRINTHOOD "PrintHood" - IDS_NETHOOD "NetHood" + IDS_PRINTHOOD "ÐÑÐ¸Ð½ÑÐµÑÑ" + IDS_NETHOOD "Ð¡ÐµÑÐµÐ²Ð¾Ðµ Ð¾ÐºÑÑÐ¶ÐµÐ½Ð¸Ðµ" IDS_LOCALSETTINGS "Local Settings" IDS_LOCALAPPDATA "Local Settings\\Application Data" IDS_TEMP "Local Settings\\Temp"

1 0

[akhaldi] 65794: [NOTEPAD] Uzbek translation by Kudratov Olimjon. CORE-8948
by akhaldi＠svn.reactos.org 22 Dec '14

22 Dec '14

Author: akhaldi Date: Mon Dec 22 19:01:03 2014 New Revision: 65794 URL: http://svn.reactos.org/svn/reactos?rev=65794&view=rev Log: [NOTEPAD] Uzbek translation by Kudratov Olimjon. CORE-8948 Added: trunk/reactos/base/applications/notepad/lang/uz-UZ.rc (with props) Modified: trunk/reactos/base/applications/notepad/rsrc.rc Added: trunk/reactos/base/applications/notepad/lang/uz-UZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/uz-UZ.rc (added) +++ trunk/reactos/base/applications/notepad/lang/uz-UZ.rc [iso-8859-1] Mon Dec 22 19:01:03 2014 @@ -0,0 +1,173 @@ +LANGUAGE LANG_UZBEK, SUBLANG_DEFAULT + +ID_ACCEL ACCELERATORS +BEGIN + "^A", CMD_SELECT_ALL + "^C", CMD_COPY + "^F", CMD_SEARCH + "^G", CMD_GOTO + "H", CMD_REPLACE, VIRTKEY, CONTROL + "^N", CMD_NEW + "^O", CMD_OPEN + "^P", CMD_PRINT + "^S", CMD_SAVE + "^V", CMD_PASTE + "^X", CMD_CUT + "^Z", CMD_UNDO + VK_F3, CMD_SEARCH_NEXT, VIRTKEY + VK_F5, CMD_TIME_DATE, VIRTKEY +END + +MAIN_MENU MENU +BEGIN + POPUP "&Fayl" + BEGIN + MENUITEM "&Yangi\tCtrl+N", CMD_NEW + MENUITEM "Oc&hmoq...\tCtrl+O", CMD_OPEN + MENUITEM "&Saqlamoq\tCtrl+S", CMD_SAVE + MENUITEM "Quyid&agicha saqlamoq...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Sahi&fa parametrlari...", CMD_PAGE_SETUP + MENUITEM "Chop &etmoq...\tCtrl+P", CMD_PRINT + MENUITEM "&ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð¿ÑÐ¸Ð½ÑÐµÑÐ°...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "Chiq&moq", CMD_EXIT + END + POPUP "Oâ&zgartirmoq" + BEGIN + MENUITEM "&Bekor qilmoq\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "Qi&rqib olmoq\tCtrl+X", CMD_CUT + MENUITEM "&Nusxa koâchirmoq\tCtrl+C", CMD_COPY + MENUITEM "Qoâs&hib qoâymoq\tCtrl+V", CMD_PASTE + MENUITEM "&Yoâq qilmoq\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "&Topmoq...", CMD_SEARCH + MENUITEM "K&eyingisini topmoq\tF3", CMD_SEARCH_NEXT + MENUITEM "Al&mashtirmoq...\tCtrl+H", CMD_REPLACE + MENUITEM "&Oâtmoq...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "B&archasini belgilamoq", CMD_SELECT_ALL + MENUITEM "Vaqt/&Sana\tF5", CMD_TIME_DATE + END + POPUP "For&matlamoq" + BEGIN + MENUITEM "Soâ&zlarni koâchirish", CMD_WRAP + MENUITEM "&Shrift...", CMD_FONT + END + POPUP "Koâ&rib chiqmoq" + BEGIN + MENUITEM "&Holat satri", CMD_STATUSBAR + END + POPUP "&Yordam" + BEGIN + MENUITEM "&Ð¡Ð¾Ð´ÐµÑÐ¶Ð°Ð½Ð¸Ðµ", CMD_HELP_CONTENTS + MENUITEM "&ÐÐ¾Ð¸ÑÐº...", CMD_HELP_SEARCH + MENUITEM "&ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ ÑÐ¿ÑÐ°Ð²ÐºÐ¸", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "Bloknot h&aqida", CMD_ABOUT + MENUITEM "&Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ...", CMD_ABOUT_WINE + END +END + +/* Dialog 'Page setup' */ +DIALOG_PAGESETUP DIALOGEX 0, 0, 225, 95 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Sahifa parametrlari" +BEGIN + LTEXT "Sa&rlavha:", 0x140, 10, 07, 40, 15 + EDITTEXT 0x141, 60, 05, 110, 12, WS_BORDER | WS_TABSTOP + LTEXT "Pastki kolontit&ul:", 0x142, 10, 24, 40, 15 + EDITTEXT 0x143, 60, 22, 110, 12, WS_BORDER | WS_TABSTOP + GROUPBOX "Chegaralar (Ð¼Ð¼):", 0x144, 10, 43, 160, 45 + LTEXT "C&hap:", 0x145, 20, 55, 30, 10, WS_CHILD + EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP + LTEXT "&Yuqori:", 0x148, 20, 73, 30, 10, WS_CHILD + EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP + LTEXT "Oâ&ng:", 0x14B, 100, 55, 30, 10, WS_CHILD + EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP + LTEXT "Pa&st:", 0x14E, 100, 73, 30, 10, WS_CHILD + EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP + DEFPUSHBUTTON "Ha", IDOK, 180, 3, 40, 15, WS_TABSTOP + PUSHBUTTON "Bekor qilmoq", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP + PUSHBUTTON "&Ð¡Ð¿ÑÐ°Ð²ÐºÐ°", IDHELP, 180, 39, 40, 15, WS_TABSTOP +END + +/* Dialog 'Encoding' */ +DIALOG_ENCODING DIALOGEX 0, 0, 256, 44 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "ÐÐ¾Ð´Ð¸ÑÐ¾Ð²ÐºÐ° ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð²" +BEGIN + COMBOBOX ID_ENCODING, 54, 0, 156, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Kodlash:", 0x155, 5, 2, 41, 12 + COMBOBOX ID_EOLN, 54, 18, 156, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "ÐÐ¾Ð½ÐµÑ ÑÑÑÐ¾ÐºÐ¸:", 0x156, 5, 20, 50, 12 +END + +/* Dialog 'Go To' */ +DIALOG_GOTO DIALOGEX 0, 0, 165, 50 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Qatorga oâtish" +BEGIN + EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP + LTEXT "Q&ator raqami:", 0x155, 5, 12, 49, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER + DEFPUSHBUTTON "Oâtmoq", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP + PUSHBUTTON "Bekor qilmoq", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP +END + +IDD_ABOUTBOX DIALOGEX 22, 16, 284, 170 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ ÐÐ»Ð¾ÐºÐ½Ð¾Ñ ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "ÐÐ»Ð¾ÐºÐ½Ð¾Ñ ReactOS v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack(a)looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\n ", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 + CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 + DEFPUSHBUTTON "ÐÐ°ÐºÑÑÑÑ", IDOK, 114, 149, 44, 15, WS_GROUP + ICON IDI_NPICON, -1, 12, 9, 20, 30 + EDITTEXT IDC_LICENSE, 8, 64, 272, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL +END + +STRINGTABLE +BEGIN + STRING_LICENSE "ÐÑÐ° Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð° ÑÐ²Ð»ÑÐµÑÑÑ ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾ ÑÐ°ÑÐ¿ÑÐ¾ÑÑÑÐ°Ð½ÑÐµÐ¼Ð¾Ð¹; ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ ÑÐ°ÑÐ¿ÑÐ¾ÑÑÑÐ°Ð½ÑÑÑ ÐµÐµ Ð¿Ð¾Ð²ÑÐ¾ÑÐ½Ð¾ Ð¸ (Ð¸Ð»Ð¸) Ð¸Ð·Ð¼ÐµÐ½ÑÑÑ, ÑÐ¾Ð±Ð»ÑÐ´Ð°Ñ ÑÑÐ»Ð¾Ð²Ð¸Ñ ÐÑÐºÑÑÑÐ¾Ð³Ð¾ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ð¾Ð³Ð¾ ÑÐ¾Ð³Ð»Ð°ÑÐµÐ½Ð¸Ñ GNU, Ð¾Ð¿ÑÐ±Ð»Ð¸ÐºÐ¾Ð²Ð°Ð½Ð½Ð¾Ð³Ð¾ Ð¤Ð¾Ð½Ð´Ð¾Ð¼ ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾ ÑÐ°ÑÐ¿ÑÐ¾ÑÑÑÐ°Ð½ÑÐµÐ¼Ð¾Ð³Ð¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð½Ð¾Ð³Ð¾ Ð¾Ð±ÐµÑÐ¿ÐµÑÐµÐ½Ð¸Ñ; Ð»Ð¸Ð±Ð¾ ÑÐµÐ´Ð°ÐºÑÐ¸Ð¸ 2 Ð¡Ð¾Ð³Ð»Ð°ÑÐµÐ½Ð¸Ñ, Ð»Ð¸Ð±Ð¾ (Ð½Ð° Ð²Ð°ÑÐµ ÑÑÐ¼Ð¾ÑÑÐµÐ½Ð¸Ðµ) Ð»ÑÐ±Ð¾Ð¹ ÑÐµÐ´Ð°ÐºÑÐ¸Ð¸, Ð²ÑÐ¿ÑÑÐµÐ½Ð½Ð¾Ð¹ Ð¿Ð¾Ð·Ð¶Ðµ.\r\n\r\nÐÑÐ° Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð° ÑÐ°ÑÐ¿ÑÐ¾ÑÑÑÐ°Ð½ÑÐµÑÑÑ Ð² Ð½Ð°Ð´ÐµÐ¶Ð´Ðµ Ð½Ð° ÑÐ¾, ÑÑÐ¾ Ð¾Ð½Ð° Ð¾ÐºÐ°Ð¶ÐµÑÑÑ Ð¿Ð¾Ð»ÐµÐ·Ð½Ð¾Ð¹, Ð½Ð¾ ÐÐÐ ÐÐÐÐÐ¥-ÐÐÐÐ ÐÐÐ ÐÐÐ¢ÐÐ, Ð²ÐºÐ»ÑÑÐ°Ñ Ð¿Ð¾Ð´ÑÐ°Ð·ÑÐ¼ÐµÐ²Ð°ÐµÐ¼ÑÑ Ð³Ð°ÑÐ°Ð½ÑÐ¸Ñ ÐÐÐ§ÐÐ¡Ð¢ÐÐ Ð»Ð¸Ð±Ð¾ ÐÐ ÐÐÐÐÐÐÐ¡Ð¢Ð ÐÐÐ¯ ÐÐÐ ÐÐÐÐÐÐÐÐ«Ð¥ Ð¦ÐÐÐÐ. ÐÐ¾Ð´ÑÐ¾Ð±Ð½Ð¾ÑÑÐ¸ ÑÐ¾Ð´ÐµÑÐ¶Ð°ÑÑÑ Ð² ÐÑÐºÑÑÑÐ¾Ð¼ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ð¾Ð¼ ÑÐ¾Ð³Ð»Ð°ÑÐµÐ½Ð¸Ð¸ GNU.\r\n\r\nÐÐ¼ÐµÑÑÐµ Ñ ÑÑÐ¾Ð¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð¾Ð¹ Ð´Ð¾Ð»Ð¶ÐµÐ½ ÑÐ°ÑÐ¿ÑÐ¾ÑÑÑÐ°Ð½ÑÑÑÑÑ ÑÐºÐ·ÐµÐ¼Ð¿Ð»ÑÑ ÐÑÐºÑÑÑÐ¾Ð³Ð¾ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ð¾Ð³Ð¾ ÑÐ¾Ð³Ð»Ð°ÑÐµÐ½Ð¸Ñ GNU, ÐµÑÐ»Ð¸ Ð¾Ð½ Ð¾ÑÑÑÑÑÑÐ²ÑÐµÑ, ÑÐ¾Ð¾Ð±ÑÐ¸ÑÐµ Ð¾Ð± ÑÑÐ¾Ð¼ Ð² Ð¤Ð¾Ð½Ð´ ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾ ÑÐ°ÑÐ¿ÑÐ¾ÑÑÑÐ°Ð½ÑÐµÐ¼Ð¾Ð³Ð¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð½Ð¾Ð³Ð¾ Ð¾Ð±ÐµÑÐ¿ÐµÑÐµÐ½Ð¸Ñ (Free Software Foundation, Inc.), 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." +END + +STRINGTABLE +BEGIN + STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ + STRING_PAGESETUP_FOOTERVALUE "Sahifa &s" /* FIXME */ + STRING_PAGESETUP_LEFTVALUE "20 Ð¼Ð¼" /* FIXME */ + STRING_PAGESETUP_RIGHTVALUE "20 Ð¼Ð¼" /* FIXME */ + STRING_PAGESETUP_TOPVALUE "25 Ð¼Ð¼" /* FIXME */ + STRING_PAGESETUP_BOTTOMVALUE "25 Ð¼Ð¼" /* FIXME */ + STRING_NOTEPAD "Bloknot" + STRING_ERROR "ÐÐ¨ÐÐÐÐ" + STRING_WARNING "ÐÐÐÐÐÐÐÐ" + STRING_INFO "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ" + STRING_UNTITLED "Nomsiz" + STRING_ALL_FILES "Barcha fayllar(*.*)" + STRING_TEXT_FILES_TXT "Matn hujjatlari (*.txt)" + STRING_TOOLARGE "'%s' fayli Bloknot uchun juda katta.\n\ +Faylni oâzgartirish uchun boshqa matn muharriridan foydalaning." + STRING_NOTEXT "ÐÑ Ð½Ðµ Ð²Ð²ÐµÐ»Ð¸ ÑÐµÐºÑÑ.\n\ +ÐÐ²ÐµÐ´Ð¸ÑÐµ ÑÑÐ¾-Ð½Ð¸Ð±ÑÐ´Ñ Ð¸ Ð¿Ð¾Ð¿ÑÐ¾Ð±ÑÐ¹ÑÐµ ÐµÑÐµ." + STRING_DOESNOTEXIST "'%s'\nfaylni topa olmadi\n\n\ +Yangi fayl yaratishni istaysizmi?" + STRING_NOTSAVED "'%s'\nfayldagi matn oâzgartirilgan.\n\n\ +Oâzgarishlarni saqlashni istaysizmi?" + STRING_NOTFOUND "'%s' ni topa olmadi." + STRING_OUT_OF_MEMORY "Ushbu operatsiyani tugatish uchun yetarlicha xotira mavjud emas.\ +\nMavjud xotirani koâpaytirish uchun bir yoki bir necha dasturlarni yoping va qaytadan harakat qiling." + STRING_CANNOTFIND "'%s' ni topa olmadi" + STRING_ANSI "ANSI" + STRING_UNICODE "Unicode" + STRING_UNICODE_BE "Unicode (big endian)" + STRING_UTF8 "UTF-8" + STRING_CRLF "Windows (CR + LF)" + STRING_LF "Unix (LF)" + STRING_CR "Macintosh (CR)" + STRING_LINE_COLUMN "Qator %d, Ustun %d" +END Propchange: trunk/reactos/base/applications/notepad/lang/uz-UZ.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/notepad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/rsrc.rc [iso-8859-1] Mon Dec 22 19:01:03 2014 @@ -109,6 +109,9 @@ #ifdef LANGUAGE_UK_UA #include "lang/uk-UA.rc" #endif +#ifdef LANGUAGE_UZ_UZ + #include "lang/uz-UZ.rc" +#endif #ifdef LANGUAGE_SK_SK #include "lang/sk-SK.rc" #endif

1 0

[akhaldi] 65793: [MPLAY32] Fix some entries in the Chinese (zh-CN) translation. Spotted by Alexander Misel and fixed by Henry Tang Ih. CORE-8918
by akhaldi＠svn.reactos.org 22 Dec '14

22 Dec '14

Author: akhaldi Date: Mon Dec 22 18:52:25 2014 New Revision: 65793 URL: http://svn.reactos.org/svn/reactos?rev=65793&view=rev Log: [MPLAY32] Fix some entries in the Chinese (zh-CN) translation. Spotted by Alexander Misel and fixed by Henry Tang Ih. CORE-8918 Modified: trunk/reactos/base/applications/mplay32/lang/zh-CN.rc Modified: trunk/reactos/base/applications/mplay32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/zh-CN.rc [iso-8859-1] Mon Dec 22 18:52:25 2014 @@ -11,22 +11,22 @@ MENUITEM SEPARATOR MENUITEM "éåº(&E)", IDM_EXIT END - POPUP "&ææ¾" + POPUP "ææ¾(&P)" BEGIN - MENUITEM "ææ¾/&æå\tCtrl+P", IDC_PLAY - MENUITEM "å&æ¢\tCtrl+S", IDC_STOP + MENUITEM "ææ¾/æå(&P)\tCtrl+P", IDC_PLAY + MENUITEM "åæ¢(&S)\tCtrl+S", IDC_STOP MENUITEM SEPARATOR - MENUITEM "é&å¤\tCtrl+T", IDM_REPEAT + MENUITEM "éå¤(&R)\tCtrl+T", IDM_REPEAT END - POPUP "&è§å¾" + POPUP "è§å¾(&V)" BEGIN - MENUITEM "åçª &æ¨¡å¼", IDM_SWITCHVIEW + MENUITEM "åçªæ¨¡å¼(&M)", IDM_SWITCHVIEW END - POPUP "&è®¾å¤" + POPUP "è®¾å¤(&D)" BEGIN - MENUITEM "&å±æ§", IDM_DEVPROPS + MENUITEM "å±æ§(%P)", IDM_DEVPROPS MENUITEM SEPARATOR - MENUITEM "&é³éæ§å¶", IDM_VOLUMECTL + MENUITEM "é³éæ§å¶(&V)", IDM_VOLUMECTL END POPUP "å¸®å©(&H)" BEGIN

1 0

[akhaldi] 65792: [SHELL32] Sync translations to the English one. Translators, you're on!
by akhaldi＠svn.reactos.org 22 Dec '14

22 Dec '14

Author: akhaldi Date: Mon Dec 22 18:48:47 2014 New Revision: 65792 URL: http://svn.reactos.org/svn/reactos?rev=65792&view=rev Log: [SHELL32] Sync translations to the English one. Translators, you're on! 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/de-DE.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/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/ro-RO.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] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" IDS_EXE_DESCRIPTION "Description:" -END + + IDS_MENU_EMPTY "(Empty)" +END 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] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" IDS_EXE_DESCRIPTION "Description:" -END + + IDS_MENU_EMPTY "(Empty)" +END 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] Mon Dec 22 18:48:47 2014 @@ -45,6 +45,23 @@ MENUITEM SEPARATOR MENUITEM "&Vlastnosti", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -801,4 +818,6 @@ IDS_BYTES_FORMAT "bajtÅ¯" IDS_UNKNOWN_APP "NeznÃ¡mÃ¡ aplikace" IDS_EXE_DESCRIPTION "Popis:" -END + + IDS_MENU_EMPTY "(Empty)" +END 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] Mon Dec 22 18:48:47 2014 @@ -45,6 +45,23 @@ MENUITEM SEPARATOR MENUITEM "Egenskaber", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -801,4 +818,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" IDS_EXE_DESCRIPTION "Description:" -END + + IDS_MENU_EMPTY "(Empty)" +END Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Mon Dec 22 18:48:47 2014 @@ -812,6 +812,6 @@ IDS_BYTES_FORMAT "Bytes" IDS_UNKNOWN_APP "Unbekannte Anwendung" IDS_EXE_DESCRIPTION "Beschreibung:" - + IDS_MENU_EMPTY "(Leer)" END 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] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "ÎÎ´Î¹ÏÏÎ·ÏÎµÏ", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" IDS_EXE_DESCRIPTION "Description:" -END + + IDS_MENU_EMPTY "(Empty)" +END 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] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" IDS_EXE_DESCRIPTION "Description:" -END + + IDS_MENU_EMPTY "(Empty)" +END 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] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "Propiedades", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" IDS_EXE_DESCRIPTION "Description:" -END + + IDS_MENU_EMPTY "(Empty)" +END 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] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "Ominaisuudet", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" IDS_EXE_DESCRIPTION "Description:" -END + + IDS_MENU_EMPTY "(Empty)" +END 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] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "PropriÃ©tÃ©s", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "octets" IDS_UNKNOWN_APP "Application inconnue" IDS_EXE_DESCRIPTION "Description :" -END + + IDS_MENU_EMPTY "(Empty)" +END 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] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "×××¤××× ××", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" IDS_EXE_DESCRIPTION "Description:" -END + + IDS_MENU_EMPTY "(Empty)" +END 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] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "BeÃ¡llÃtÃ¡sok", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" IDS_EXE_DESCRIPTION "Description:" -END + + IDS_MENU_EMPTY "(Empty)" +END 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] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "ProprietÃ ", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "byte" IDS_UNKNOWN_APP "Applicazione sconosciuta" IDS_EXE_DESCRIPTION "Descrizione:" -END + + IDS_MENU_EMPTY "(Empty)" +END 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] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "ããããã£", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" IDS_EXE_DESCRIPTION "Description:" -END + + IDS_MENU_EMPTY "(Empty)" +END 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] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" IDS_EXE_DESCRIPTION "Description:" -END + + IDS_MENU_EMPTY "(Empty)" +END 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] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" IDS_EXE_DESCRIPTION "Description:" -END + + IDS_MENU_EMPTY "(Empty)" +END 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] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "Egenskaper", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" IDS_EXE_DESCRIPTION "Description:" -END + + IDS_MENU_EMPTY "(Empty)" +END 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] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "WÅaÅciwoÅci", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "bajtÃ³w" IDS_UNKNOWN_APP "Nieznana aplikacja" IDS_EXE_DESCRIPTION "Opis:" -END + + IDS_MENU_EMPTY "(Empty)" +END 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] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "Propriedades", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Aplicativo desconhecido" IDS_EXE_DESCRIPTION "DescriÃ§Ã£o:" -END + + IDS_MENU_EMPTY "(Empty)" +END 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] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "Propriedades", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" IDS_EXE_DESCRIPTION "Description:" -END + + IDS_MENU_EMPTY "(Empty)" +END Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] Mon Dec 22 18:48:47 2014 @@ -41,6 +41,23 @@ MENUITEM SEPARATOR MENUITEM "&ProprietÄÈi", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -797,4 +814,6 @@ IDS_BYTES_FORMAT "octeÈi" IDS_UNKNOWN_APP "AplicaÈie nespecificatÄ" IDS_EXE_DESCRIPTION "Descriere:" -END + + IDS_MENU_EMPTY "(Empty)" +END 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] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "Vl&astnosti", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" IDS_EXE_DESCRIPTION "Description:" -END + + IDS_MENU_EMPTY "(Empty)" +END 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] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" IDS_EXE_DESCRIPTION "Description:" -END + + IDS_MENU_EMPTY "(Empty)" +END 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] Mon Dec 22 18:48:47 2014 @@ -43,6 +43,23 @@ MENUITEM SEPARATOR MENUITEM "CilÃ«sime", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -799,4 +816,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Aplikacion panjohur" IDS_EXE_DESCRIPTION "PÃ«rshkrimi:" -END + + IDS_MENU_EMPTY "(Empty)" +END 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] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" IDS_EXE_DESCRIPTION "Description:" -END + + IDS_MENU_EMPTY "(Empty)" +END 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] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "Ãzellikler", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "bayt" IDS_UNKNOWN_APP "Bilinmeyen uygulama" IDS_EXE_DESCRIPTION "AÃ§Ä±klama:" -END + + IDS_MENU_EMPTY "(Empty)" +END 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] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "ÐÐ»Ð°ÑÑÐ¸Ð²Ð¾ÑÑÑ", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" IDS_EXE_DESCRIPTION "Description:" -END + + IDS_MENU_EMPTY "(Empty)" +END 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] Mon Dec 22 18:48:47 2014 @@ -48,6 +48,23 @@ MENUITEM SEPARATOR MENUITEM "å±æ§", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -804,4 +821,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" IDS_EXE_DESCRIPTION "Description:" -END + + IDS_MENU_EMPTY "(Empty)" +END 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] Mon Dec 22 18:48:47 2014 @@ -47,6 +47,23 @@ MENUITEM SEPARATOR MENUITEM "å±¬æ§", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -803,4 +820,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" IDS_EXE_DESCRIPTION "Description:" -END + + IDS_MENU_EMPTY "(Empty)" +END

1 0

[akhaldi] 65791: [SHELL32] Update Russian translation by Petr Akhlamov. CORE-8942
by akhaldi＠svn.reactos.org 22 Dec '14

22 Dec '14

Author: akhaldi Date: Mon Dec 22 18:38:27 2014 New Revision: 65791 URL: http://svn.reactos.org/svn/reactos?rev=65791&view=rev Log: [SHELL32] Update Russian translation by Petr Akhlamov. CORE-8942 Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Mon Dec 22 18:38:27 2014 @@ -41,6 +41,23 @@ MENUITEM SEPARATOR MENUITEM "Ð¡Ð²Ð¾&Ð¹ÑÑÐ²Ð°", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&ÐÑÐ¼ÐµÐ½Ð¸ÑÑ\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "&ÐÑÑÐµÐ·Ð°ÑÑ\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "ÐÑÑ&Ð°Ð²Ð¸ÑÑ\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "ÐÑÑÐ°Ð²Ð¸ÑÑ &ÑÑÐ»ÑÐº", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "ÐÐ¾&Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ Ð² Ð¿Ð°Ð¿ÐºÑ...", FCIDM_SHVIEW_COPYTO + MENUITEM "Ð&ÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ Ð² Ð¿Ð°Ð¿ÐºÑ...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "ÐÑÐ´ÐµÐ»Ð¸ÑÑ Ð²&ÑÐµ\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "ÐÐ±ÑÐ°ÑÐ¸ÑÑ Ð²&ÑÐ´ÐµÐ»ÐµÐ½Ð¸Ðµ", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -610,16 +627,15 @@ IDD_NOOPEN DIALOGEX 0, 0, 240, 75 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Caution" +CAPTION "ÐÑÐµÐ´ÑÐ¿ÑÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 - LTEXT "This file could either be used by the operating system or by\n\ -another application. Modifying this file might damage your\n\ -system or make it less functional.\n\n\ -Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 - DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 - PUSHBUTTON "No", IDNO, 180, 55, 50, 14 + LTEXT "ÐÑÐ¾Ñ ÑÐ°Ð¹Ð» Ð¼Ð¾Ð¶ÐµÑ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑÑÑ Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½Ð¾Ð¹ ÑÐ¸ÑÑÐµÐ¼Ð¾Ð¹ Ð¸Ð»Ð¸\n\ +Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð°Ð¼Ð¸. ÐÐ³Ð¾ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð¿Ð¾Ð²ÑÐµÐ´Ð¸ÑÑ ÑÐ¸ÑÑÐµÐ¼Ñ.\n\n\ +ÐÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ Ð¾ÑÐºÑÑÑÑ ÑÑÐ¾Ñ ÑÐ°Ð¹Ð»?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "ÐÐ°", IDYES, 125, 55, 50, 14 + PUSHBUTTON "ÐÐµÑ", IDNO, 180, 55, 50, 14 END STRINGTABLE @@ -797,4 +813,6 @@ IDS_BYTES_FORMAT "Ð±Ð°Ð¹Ñ" IDS_UNKNOWN_APP "ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½Ð¾Ðµ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ" IDS_EXE_DESCRIPTION "ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ:" -END + + IDS_MENU_EMPTY "(Ð¿ÑÑÑÐ¾)" +END

1 0

[hbelusca] 65790: [WHOAMI] - In German translation, replace erroneous \" to "" for putting quotes inside strings. Fixes resource compilation in GCC/MSVC. - Make proper help string indentation in re...
by hbelusca＠svn.reactos.org 22 Dec '14

22 Dec '14

Author: hbelusca Date: Mon Dec 22 12:28:05 2014 New Revision: 65790 URL: http://svn.reactos.org/svn/reactos?rev=65790&view=rev Log: [WHOAMI] - In German translation, replace erroneous \" to "" for putting quotes inside strings. Fixes resource compilation in GCC/MSVC. - Make proper help string indentation in resource files. NOTE FOR TRANSLATORS: Please keep the identation correct! Modified: trunk/reactos/base/applications/cmdutils/whoami/lang/de-DE.rc trunk/reactos/base/applications/cmdutils/whoami/lang/en-US.rc trunk/reactos/base/applications/cmdutils/whoami/lang/es-ES.rc Modified: trunk/reactos/base/applications/cmdutils/whoami/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/whoami/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/whoami/lang/de-DE.rc [iso-8859-1] Mon Dec 22 12:28:05 2014 @@ -31,26 +31,26 @@ IDS_STATE_DISABLED "Deaktiviert" IDS_ERROR_UPN "FEHLER: Der UPN (User Principal Name) konnte nicht abgerufen werden, da\nder aktuelle Benutzer kein Domänenbenutzer ist.\n" IDS_ERROR_FQDN "FEHLER: Der FQDN (Fully Qualified Distinguished Name) konnte nicht\nabgerufen werden, da der aktuelle Benutzer kein Domänenbenutzer ist.\n" - IDS_ERROR_VALUEXPECTED "FEHLER: Ungültige Syntax. Wert für '/fo' erwartet.\nGeben Sie \"WHOAMI /?\" ein, um die Syntax anzuzeigen.\n" - IDS_ERROR_VALUENOTALLOWED "FEHLER: Das angegebene Format (/FO) ist ungültig.\nGeben Sie \"WHOAMI /?\" ein, um die Syntax anzuzeigen.\n" - IDS_ERROR_1TIMES "FEHLER: Ungültige Syntax. Option \"%s\" darf nicht mehr als '1' Mal verwendet werden.\nGeben Sie \"WHOAMI /?\" ein, um die Syntax anzuzeigen.\n" - IDS_ERROR_INVALIDSYNTAX "FEHLER: Ungültige Syntax.\nGeben Sie \"WHOAMI /?\" ein, um die Syntax anzuzeigen.\n" - IDS_ERROR_INVALIDARG "FEHLER: Argument/Option ungültig - '%s'.\nGeben Sie \"WHOAMI /?\" ein, um die Syntax anzuzeigen.\n" - IDS_ERROR_NH_LIST "FEHLER: Option /NH kann nicht mit Format LIST verwendet werden.\nGeben Sie \"WHOAMI /?\" ein, um die Syntax anzuzeigen.\n" + IDS_ERROR_VALUEXPECTED "FEHLER: Ungültige Syntax. Wert für '/fo' erwartet.\nGeben Sie ""WHOAMI /?"" ein, um die Syntax anzuzeigen.\n" + IDS_ERROR_VALUENOTALLOWED "FEHLER: Das angegebene Format (/FO) ist ungültig.\nGeben Sie ""WHOAMI /?"" ein, um die Syntax anzuzeigen.\n" + IDS_ERROR_1TIMES "FEHLER: Ungültige Syntax. Option ""%s"" darf nicht mehr als '1' Mal verwendet werden.\nGeben Sie ""WHOAMI /?"" ein, um die Syntax anzuzeigen.\n" + IDS_ERROR_INVALIDSYNTAX "FEHLER: Ungültige Syntax.\nGeben Sie ""WHOAMI /?"" ein, um die Syntax anzuzeigen.\n" + IDS_ERROR_INVALIDARG "FEHLER: Argument/Option ungültig - '%s'.\nGeben Sie ""WHOAMI /?"" ein, um die Syntax anzuzeigen.\n" + IDS_ERROR_NH_LIST "FEHLER: Option /NH kann nicht mit Format LIST verwendet werden.\nGeben Sie ""WHOAMI /?"" ein, um die Syntax anzuzeigen.\n" IDS_HELP "BESCHREIBUNG:\n\ - Ermittelt Benutzername, Gruppen und Berechtigungen für den aktuellen Benutzer auf dem lokalen System.\n\ - Ohne Parameterangabe werden die aktuelle Domäne und Benutzername angezeigt.\n\ - \n\ - Gültige Ausgabeformate für den '/fo' Parameter sind 'CSV', 'LIST' und 'TABLE'.\n\ - '/nh' legt fest, dass der Spaltenheader nicht in der Ausgabe angezeigt wird. Standardmäßig werden diese in einer TABLE angezeigt.\n\ - \n\ - SYNTAX:\n\ - whoami [/upn | /fqdn | /logonid] \n\ - whoami {[/user] [/groups] [/priv]} [/fo <Format>] [/nh] \n\ - whoami /all [/fo <Format>] [/nh] \n\ - \n\ - BEISPIELE: \n\ - whoami /groups /priv /nh /fo csv \n\ - whoami /logonid \n\ - whoami \n" + Ermittelt Benutzername, Gruppen und Berechtigungen für den aktuellen Benutzer auf dem lokalen System.\n\ + Ohne Parameterangabe werden die aktuelle Domäne und Benutzername angezeigt.\n\ +\n\ + Gültige Ausgabeformate für den '/fo' Parameter sind 'CSV', 'LIST' und 'TABLE'.\n\ + '/nh' legt fest, dass der Spaltenheader nicht in der Ausgabe angezeigt wird. Standardmäßig werden diese in einer TABLE angezeigt.\n\ +\n\ +SYNTAX:\n\ + whoami [/upn | /fqdn | /logonid] \n\ + whoami {[/user] [/groups] [/priv]} [/fo <Format>] [/nh] \n\ + whoami /all [/fo <Format>] [/nh] \n\ +\n\ +BEISPIELE: \n\ + whoami /groups /priv /nh /fo csv \n\ + whoami /logonid \n\ + whoami \n" END Modified: trunk/reactos/base/applications/cmdutils/whoami/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/whoami/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/whoami/lang/en-US.rc [iso-8859-1] Mon Dec 22 12:28:05 2014 @@ -38,19 +38,19 @@ IDS_ERROR_INVALIDARG "ERROR: Invalid argument/option - '%s'.\nType ""WHOAMI /?"" for usage.\n" IDS_ERROR_NH_LIST "ERROR: /NH switch cannot be used with the LIST format.\nType ""WHOAMI /?"" for usage.\n" IDS_HELP "DESCRIPTION:\n\ - Display user, group and privileges information for the local logged-on user.\n\ - If no arguments are provided, displays the current domain and user name.\n\ - \n\ - Available output formats for the '/fo' option are 'csv', 'list' and 'table'.\n\ - Use '/nh' to hide headers. By default the data is displayed in a table.\n\ - \n\ - SYNTAX:\n\ - whoami [/upn | /fqdn | /logonid] \n\ - whoami {[/user] [/groups] [/priv]} [/fo <Format>] [/nh] \n\ - whoami /all [/fo <Format>] [/nh] \n\ - \n\ - EXAMPLES: \n\ - whoami /groups /priv /nh /fo csv \n\ - whoami /logonid \n\ - whoami \n" + Display user, group and privileges information for the local logged-on user.\n\ + If no arguments are provided, displays the current domain and user name.\n\ +\n\ + Available output formats for the '/fo' option are 'csv', 'list' and 'table'.\n\ + Use '/nh' to hide headers. By default the data is displayed in a table.\n\ +\n\ +SYNTAX:\n\ + whoami [/upn | /fqdn | /logonid] \n\ + whoami {[/user] [/groups] [/priv]} [/fo <Format>] [/nh] \n\ + whoami /all [/fo <Format>] [/nh] \n\ +\n\ +EXAMPLES: \n\ + whoami /groups /priv /nh /fo csv \n\ + whoami /logonid \n\ + whoami \n" END Modified: trunk/reactos/base/applications/cmdutils/whoami/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/whoami/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/whoami/lang/es-ES.rc [iso-8859-1] Mon Dec 22 12:28:05 2014 @@ -39,20 +39,20 @@ IDS_ERROR_INVALIDARG "ERROR: Argumento u opciÃ³n no vÃ¡lido - ""%s"".\nEscriba ""WHOAMI /?"" para su uso.\n" IDS_ERROR_NH_LIST "ERROR: no se puede usar el modificador /NH con el formato LIST.\nEscriba ""WHOAMI /?"" para obtener detalles de uso.\n" IDS_HELP "DESCRIPCIÃN:\n\ - Muestra informaciÃ³n sobre el usuario local, sus privilegios y grupos.\n\ - Si no se aÃ±aden argumentos se mostrarÃ¡ el usuario y dominio actual.\n\ - \n\ - Los formatos disponibles para '/fo' son 'csv', 'list' y 'table'.\n\ - Por defecto los datos se muestran en una tabla (opciÃ³n 'table').\n\ - Puedes utilizar '/nh' para ocultar los encabezados. \n\ - \n\ - SINTAXIS:\n\ - whoami [/upn | /fqdn | /logonid] \n\ - whoami {[/user] [/groups] [/priv]} [/fo <Formato>] [/nh] \n\ - whoami /all [/fo <Formato>] [/nh] \n\ - \n\ - EJEMPLOS: \n\ - whoami /groups /priv /nh /fo csv \n\ - whoami /logonid \n\ - whoami \n" + Muestra informaciÃ³n sobre el usuario local, sus privilegios y grupos.\n\ + Si no se aÃ±aden argumentos se mostrarÃ¡ el usuario y dominio actual.\n\ +\n\ + Los formatos disponibles para '/fo' son 'csv', 'list' y 'table'.\n\ + Por defecto los datos se muestran en una tabla (opciÃ³n 'table').\n\ + Puedes utilizar '/nh' para ocultar los encabezados. \n\ +\n\ +SINTAXIS:\n\ + whoami [/upn | /fqdn | /logonid] \n\ + whoami {[/user] [/groups] [/priv]} [/fo <Formato>] [/nh] \n\ + whoami /all [/fo <Formato>] [/nh] \n\ +\n\ +EJEMPLOS: \n\ + whoami /groups /priv /nh /fo csv \n\ + whoami /logonid \n\ + whoami \n" END

1 0

[dreimer] 65789: [WHOAMI] German translation
by dreimer＠svn.reactos.org 22 Dec '14

22 Dec '14

Author: dreimer Date: Mon Dec 22 11:40:58 2014 New Revision: 65789 URL: http://svn.reactos.org/svn/reactos?rev=65789&view=rev Log: [WHOAMI] German translation Added: trunk/reactos/base/applications/cmdutils/whoami/lang/de-DE.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/whoami/whoami.rc Added: trunk/reactos/base/applications/cmdutils/whoami/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/whoami/lang/de-DE.rc (added) +++ trunk/reactos/base/applications/cmdutils/whoami/lang/de-DE.rc [iso-8859-1] Mon Dec 22 11:40:58 2014 @@ -0,0 +1,56 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USER_HEADER "BENUTZERINFORMATIONEN" + IDS_GROU_HEADER "GRUPPENINFORMATIONEN" + IDS_PRIV_HEADER "BERECHTIGUNGSINFORMATIONEN" + IDS_COL_USER_NAME "Benutzername" + IDS_COL_GROUP_NAME "Gruppenname" + IDS_COL_TYPE "Typ" + IDS_COL_SID "SID" + IDS_COL_ATTRIB "Attribute" + IDS_COL_PRIV_NAME "Berechtigungsname" + IDS_COL_DESCRIPTION "Beschreibung" + IDS_COL_STATE "Status" + IDS_TP_WELL_KNOWN_GROUP "Bekannte Gruppe" + IDS_TP_ALIAS "Alias" + IDS_TP_LABEL "Bezeichnung" + + /* [!] important note from the programmer: the program tries to remove + the last ', ' after concatenating, so keep than in mind when translating. + + you can test your translation of these attributes by using 'whoami /groups' */ + + IDS_ATTR_GROUP_MANDATORY "Verbindliche Gruppe, " + IDS_ATTR_GROUP_ENABLED_BY_DEFAULT "Standardmäßig aktiviert, " + IDS_ATTR_GROUP_ENABLED "Aktivierte Gruppe, " + IDS_ATTR_GROUP_OWNER "Gruppenbesitzer, " + IDS_UNKNOWN_DESCRIPTION "???" + IDS_STATE_ENABLED "Aktiviert" + IDS_STATE_DISABLED "Deaktiviert" + IDS_ERROR_UPN "FEHLER: Der UPN (User Principal Name) konnte nicht abgerufen werden, da\nder aktuelle Benutzer kein Domänenbenutzer ist.\n" + IDS_ERROR_FQDN "FEHLER: Der FQDN (Fully Qualified Distinguished Name) konnte nicht\nabgerufen werden, da der aktuelle Benutzer kein Domänenbenutzer ist.\n" + IDS_ERROR_VALUEXPECTED "FEHLER: Ungültige Syntax. Wert für '/fo' erwartet.\nGeben Sie \"WHOAMI /?\" ein, um die Syntax anzuzeigen.\n" + IDS_ERROR_VALUENOTALLOWED "FEHLER: Das angegebene Format (/FO) ist ungültig.\nGeben Sie \"WHOAMI /?\" ein, um die Syntax anzuzeigen.\n" + IDS_ERROR_1TIMES "FEHLER: Ungültige Syntax. Option \"%s\" darf nicht mehr als '1' Mal verwendet werden.\nGeben Sie \"WHOAMI /?\" ein, um die Syntax anzuzeigen.\n" + IDS_ERROR_INVALIDSYNTAX "FEHLER: Ungültige Syntax.\nGeben Sie \"WHOAMI /?\" ein, um die Syntax anzuzeigen.\n" + IDS_ERROR_INVALIDARG "FEHLER: Argument/Option ungültig - '%s'.\nGeben Sie \"WHOAMI /?\" ein, um die Syntax anzuzeigen.\n" + IDS_ERROR_NH_LIST "FEHLER: Option /NH kann nicht mit Format LIST verwendet werden.\nGeben Sie \"WHOAMI /?\" ein, um die Syntax anzuzeigen.\n" + IDS_HELP "BESCHREIBUNG:\n\ + Ermittelt Benutzername, Gruppen und Berechtigungen für den aktuellen Benutzer auf dem lokalen System.\n\ + Ohne Parameterangabe werden die aktuelle Domäne und Benutzername angezeigt.\n\ + \n\ + Gültige Ausgabeformate für den '/fo' Parameter sind 'CSV', 'LIST' und 'TABLE'.\n\ + '/nh' legt fest, dass der Spaltenheader nicht in der Ausgabe angezeigt wird. Standardmäßig werden diese in einer TABLE angezeigt.\n\ + \n\ + SYNTAX:\n\ + whoami [/upn | /fqdn | /logonid] \n\ + whoami {[/user] [/groups] [/priv]} [/fo <Format>] [/nh] \n\ + whoami /all [/fo <Format>] [/nh] \n\ + \n\ + BEISPIELE: \n\ + whoami /groups /priv /nh /fo csv \n\ + whoami /logonid \n\ + whoami \n" +END Propchange: trunk/reactos/base/applications/cmdutils/whoami/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/whoami/whoami.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/whoami/whoami.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/whoami/whoami.rc [iso-8859-1] Mon Dec 22 11:40:58 2014 @@ -14,6 +14,9 @@ /* UTF-8 */ #pragma code_page(65001) +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif

1 0

[pschweitzer] 65788: [WHOAMI] Fix invalid memory usage, memory leaks, partial zeroes, big if blocks, ... Would be nice also to check all the allocations which are not checked yet CORE-8533
by pschweitzer＠svn.reactos.org 22 Dec '14

22 Dec '14

Author: pschweitzer Date: Mon Dec 22 09:53:24 2014 New Revision: 65788 URL: http://svn.reactos.org/svn/reactos?rev=65788&view=rev Log: [WHOAMI] Fix invalid memory usage, memory leaks, partial zeroes, big if blocks, ... Would be nice also to check all the allocations which are not checked yet CORE-8533 Modified: trunk/reactos/base/applications/cmdutils/whoami/whoami.c Modified: trunk/reactos/base/applications/cmdutils/whoami/whoami.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/whoami/whoami.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/whoami/whoami.c [iso-8859-1] Mon Dec 22 09:53:24 2014 @@ -33,7 +33,7 @@ int i; if (!arg) - goto BailOut; + return FALSE; for (i = 1; i < argc; i++) { @@ -41,7 +41,6 @@ return TRUE; } - BailOut: return FALSE; } @@ -58,12 +57,16 @@ LPWSTR UsrBuf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, MAX_PATH); ULONG UsrSiz = MAX_PATH; - if (UsrBuf && GetUserNameExW(NameFormat, UsrBuf, &UsrSiz)) + if (UsrBuf == NULL) + return NULL; + + if (GetUserNameExW(NameFormat, UsrBuf, &UsrSiz)) { CharLowerW(UsrBuf); return UsrBuf; } + HeapFree(GetProcessHeap(), 0, UsrBuf); return NULL; } @@ -103,6 +106,7 @@ &dwLength)) { wprintf(L"ERROR 0x%x: could not get token information.\r\n", GetLastError()); + WhoamiFree(pTokenInfo); exit(1); } @@ -370,35 +374,33 @@ LPWSTR pSidStr = 0; PSID pSid = 0; - if (pGroupInfo) - { - /* lets see if we can find the logon SID in that list, should be there */ - for (dwIndex = 0; dwIndex < pGroupInfo->GroupCount; dwIndex++) - { - if ((pGroupInfo->Groups[dwIndex].Attributes & SE_GROUP_LOGON_ID) == SE_GROUP_LOGON_ID) - { - pSid = pGroupInfo->Groups[dwIndex].Sid; - } - } - - if (!pSid || !ConvertSidToStringSidW(pSid, &pSidStr)) - { - wprintf(L"ERROR: Couldn't convert the logon SID to a string.\n"); - return 1; - } - else - { - /* let's show our converted logon SID */ - wprintf(L"%s\n", pSidStr); - } + if (pGroupInfo == NULL) + return 0; + + /* lets see if we can find the logon SID in that list, should be there */ + for (dwIndex = 0; dwIndex < pGroupInfo->GroupCount; dwIndex++) + { + if ((pGroupInfo->Groups[dwIndex].Attributes & SE_GROUP_LOGON_ID) == SE_GROUP_LOGON_ID) + { + pSid = pGroupInfo->Groups[dwIndex].Sid; + } + } + + if (pSid == 0 || !ConvertSidToStringSidW(pSid, &pSidStr)) + { + WhoamiFree(pGroupInfo); + wprintf(L"ERROR: Couldn't convert the logon SID to a string.\n"); + return 1; + } + else + { + /* let's show our converted logon SID */ + wprintf(L"%s\n", pSidStr); } /* cleanup our allocations */ - if (pSidStr) - LocalFree(pSidStr); - - if (pGroupInfo) - WhoamiFree(pGroupInfo); + LocalFree(pSidStr); + WhoamiFree(pGroupInfo); return 0; } @@ -406,41 +408,42 @@ int WhoamiUser(void) { PTOKEN_USER pUserInfo = (PTOKEN_USER) WhoamiGetTokenInfo(TokenUser); - LPWSTR pUserStr = WhoamiGetUser(NameSamCompatible); + LPWSTR pUserStr = NULL; LPWSTR pSidStr = NULL; - - if (pUserInfo && pUserStr) - { - WhoamiTable *UserTable = WhoamiAllocTable(2, 2); - - WhoamiPrintHeader(IDS_USER_HEADER); - - /* set the column labels */ - WhoamiSetTable(UserTable, WhoamiLoadRcString(IDS_COL_USER_NAME), 0, 0); - WhoamiSetTable(UserTable, WhoamiLoadRcString(IDS_COL_SID), 0, 1); - - ConvertSidToStringSidW(pUserInfo->User.Sid, &pSidStr); - - /* set the values for our single row of data */ - WhoamiSetTable(UserTable, pUserStr, 1, 0); - WhoamiSetTable(UserTable, pSidStr, 1, 1); - - WhoamiPrintTable(UserTable); - } - else + WhoamiTable *UserTable = NULL; + + if (pUserInfo == NULL) { return 1; } + pUserStr = WhoamiGetUser(NameSamCompatible); + if (pUserStr == NULL) + { + WhoamiFree(pUserInfo); + return 1; + } + + UserTable = WhoamiAllocTable(2, 2); + + WhoamiPrintHeader(IDS_USER_HEADER); + + /* set the column labels */ + WhoamiSetTable(UserTable, WhoamiLoadRcString(IDS_COL_USER_NAME), 0, 0); + WhoamiSetTable(UserTable, WhoamiLoadRcString(IDS_COL_SID), 0, 1); + + ConvertSidToStringSidW(pUserInfo->User.Sid, &pSidStr); + + /* set the values for our single row of data */ + WhoamiSetTable(UserTable, pUserStr, 1, 0); + WhoamiSetTable(UserTable, pSidStr, 1, 1); + + WhoamiPrintTable(UserTable); + /* cleanup our allocations */ - if (pSidStr) - LocalFree(pSidStr); - - if (pUserInfo) - WhoamiFree(pUserInfo); - - if (pUserStr) - WhoamiFree(pUserStr); + LocalFree(pSidStr); + WhoamiFree(pUserInfo); + WhoamiFree(pUserStr); return 0; } @@ -473,175 +476,171 @@ }; PTOKEN_GROUPS pGroupInfo = (PTOKEN_GROUPS)WhoamiGetTokenInfo(TokenGroups); - - if (pGroupInfo) - { - /* the header is the first (0) row, so we start in the second one (1) */ - UINT PrintingRow = 1; - - WhoamiTable *GroupTable = WhoamiAllocTable(pGroupInfo->GroupCount + 1, 4); - - WhoamiPrintHeader(IDS_GROU_HEADER); - - WhoamiSetTable(GroupTable, WhoamiLoadRcString(IDS_COL_GROUP_NAME), 0, 0); - WhoamiSetTable(GroupTable, WhoamiLoadRcString(IDS_COL_TYPE), 0, 1); - WhoamiSetTable(GroupTable, WhoamiLoadRcString(IDS_COL_SID), 0, 2); - WhoamiSetTable(GroupTable, WhoamiLoadRcString(IDS_COL_ATTRIB), 0, 3); - - for (dwIndex = 0; dwIndex < pGroupInfo->GroupCount; dwIndex++) - { - LookupAccountSidW(NULL, - pGroupInfo->Groups[dwIndex].Sid, - (LPWSTR)&szGroupName, - &cchGroupName, - (LPWSTR)&szDomainName, - &cchDomainName, - &Use); - - /* the original tool seems to limit the list to these kind of SID items */ - if ((Use == SidTypeWellKnownGroup || Use == SidTypeAlias || - Use == SidTypeLabel) && !(pGroupInfo->Groups[dwIndex].Attributes & SE_GROUP_LOGON_ID)) - { + UINT PrintingRow; + WhoamiTable *GroupTable = NULL; + + if (pGroupInfo == NULL) + { + return 1; + } + + /* the header is the first (0) row, so we start in the second one (1) */ + PrintingRow = 1; + + GroupTable = WhoamiAllocTable(pGroupInfo->GroupCount + 1, 4); + + WhoamiPrintHeader(IDS_GROU_HEADER); + + WhoamiSetTable(GroupTable, WhoamiLoadRcString(IDS_COL_GROUP_NAME), 0, 0); + WhoamiSetTable(GroupTable, WhoamiLoadRcString(IDS_COL_TYPE), 0, 1); + WhoamiSetTable(GroupTable, WhoamiLoadRcString(IDS_COL_SID), 0, 2); + WhoamiSetTable(GroupTable, WhoamiLoadRcString(IDS_COL_ATTRIB), 0, 3); + + for (dwIndex = 0; dwIndex < pGroupInfo->GroupCount; dwIndex++) + { + LookupAccountSidW(NULL, + pGroupInfo->Groups[dwIndex].Sid, + (LPWSTR)&szGroupName, + &cchGroupName, + (LPWSTR)&szDomainName, + &cchDomainName, + &Use); + + /* the original tool seems to limit the list to these kind of SID items */ + if ((Use == SidTypeWellKnownGroup || Use == SidTypeAlias || + Use == SidTypeLabel) && !(pGroupInfo->Groups[dwIndex].Attributes & SE_GROUP_LOGON_ID)) + { wchar_t tmpBuffer[666]; - /* looks like windows treats 0x60 as 0x7 for some reason, let's just nod and call it a day: - 0x60 is SE_GROUP_INTEGRITY | SE_GROUP_INTEGRITY_ENABLED - 0x07 is SE_GROUP_MANDATORY | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_ENABLED */ - - if (pGroupInfo->Groups[dwIndex].Attributes == 0x60) - pGroupInfo->Groups[dwIndex].Attributes = 0x07; - - /* 1- format it as DOMAIN\GROUP if the domain exists, or just GROUP if not */ - _snwprintf((LPWSTR)&tmpBuffer, - 666, - L"%s%s%s", - szDomainName, - cchDomainName ? L"\\" : L"", - szGroupName); - - WhoamiSetTable(GroupTable, tmpBuffer, PrintingRow, 0); - - /* 2- let's find out the group type by using a simple lookup table for lack of a better method */ - WhoamiSetTable(GroupTable, WhoamiLoadRcString(SidNameUseStr[Use]), PrintingRow, 1); - - /* 3- turn that SID into text-form */ - ConvertSidToStringSidW(pGroupInfo->Groups[dwIndex].Sid, &pSidStr); - - WhoamiSetTable(GroupTable, pSidStr, PrintingRow, 2); - - LocalFree(pSidStr); - - /* 4- reuse that buffer for appending the attributes in text-form at the very end */ - ZeroMemory(tmpBuffer, 666); - - if (pGroupInfo->Groups[dwIndex].Attributes & SE_GROUP_MANDATORY) - StringCchCat(tmpBuffer, 666, WhoamiLoadRcString(IDS_ATTR_GROUP_MANDATORY)); - if (pGroupInfo->Groups[dwIndex].Attributes & SE_GROUP_ENABLED_BY_DEFAULT) - StringCchCat(tmpBuffer, 666, WhoamiLoadRcString(IDS_ATTR_GROUP_ENABLED_BY_DEFAULT)); - if (pGroupInfo->Groups[dwIndex].Attributes & SE_GROUP_ENABLED) - StringCchCat(tmpBuffer, 666, WhoamiLoadRcString(IDS_ATTR_GROUP_ENABLED)); - if (pGroupInfo->Groups[dwIndex].Attributes & SE_GROUP_OWNER) - StringCchCat(tmpBuffer, 666, WhoamiLoadRcString(IDS_ATTR_GROUP_OWNER)); - - /* remove the last comma (', ' which is 2 wchars) of the buffer, let's keep it simple */ - tmpBuffer[max(wcslen(tmpBuffer) - 2, 0)] = UNICODE_NULL; - - WhoamiSetTable(GroupTable, tmpBuffer, PrintingRow, 3); - - PrintingRow++; - } - - /* reset the buffers so that we can reuse them */ - ZeroMemory(szGroupName, 255); - ZeroMemory(szDomainName, 255); - - cchGroupName = 255; - cchDomainName = 255; - } - - WhoamiPrintTable(GroupTable); - } - else + /* looks like windows treats 0x60 as 0x7 for some reason, let's just nod and call it a day: + 0x60 is SE_GROUP_INTEGRITY | SE_GROUP_INTEGRITY_ENABLED + 0x07 is SE_GROUP_MANDATORY | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_ENABLED */ + + if (pGroupInfo->Groups[dwIndex].Attributes == 0x60) + pGroupInfo->Groups[dwIndex].Attributes = 0x07; + + /* 1- format it as DOMAIN\GROUP if the domain exists, or just GROUP if not */ + _snwprintf((LPWSTR)&tmpBuffer, + _countof(tmpBuffer), + L"%s%s%s", + szDomainName, + cchDomainName ? L"\\" : L"", + szGroupName); + + WhoamiSetTable(GroupTable, tmpBuffer, PrintingRow, 0); + + /* 2- let's find out the group type by using a simple lookup table for lack of a better method */ + WhoamiSetTable(GroupTable, WhoamiLoadRcString(SidNameUseStr[Use]), PrintingRow, 1); + + /* 3- turn that SID into text-form */ + ConvertSidToStringSidW(pGroupInfo->Groups[dwIndex].Sid, &pSidStr); + + WhoamiSetTable(GroupTable, pSidStr, PrintingRow, 2); + + LocalFree(pSidStr); + + /* 4- reuse that buffer for appending the attributes in text-form at the very end */ + ZeroMemory(tmpBuffer, sizeof(tmpBuffer)); + + if (pGroupInfo->Groups[dwIndex].Attributes & SE_GROUP_MANDATORY) + StringCchCat(tmpBuffer, _countof(tmpBuffer), WhoamiLoadRcString(IDS_ATTR_GROUP_MANDATORY)); + if (pGroupInfo->Groups[dwIndex].Attributes & SE_GROUP_ENABLED_BY_DEFAULT) + StringCchCat(tmpBuffer, _countof(tmpBuffer), WhoamiLoadRcString(IDS_ATTR_GROUP_ENABLED_BY_DEFAULT)); + if (pGroupInfo->Groups[dwIndex].Attributes & SE_GROUP_ENABLED) + StringCchCat(tmpBuffer, _countof(tmpBuffer), WhoamiLoadRcString(IDS_ATTR_GROUP_ENABLED)); + if (pGroupInfo->Groups[dwIndex].Attributes & SE_GROUP_OWNER) + StringCchCat(tmpBuffer, _countof(tmpBuffer), WhoamiLoadRcString(IDS_ATTR_GROUP_OWNER)); + + /* remove the last comma (', ' which is 2 wchars) of the buffer, let's keep it simple */ + tmpBuffer[max(wcslen(tmpBuffer) - 2, 0)] = UNICODE_NULL; + + WhoamiSetTable(GroupTable, tmpBuffer, PrintingRow, 3); + + PrintingRow++; + } + + /* reset the buffers so that we can reuse them */ + ZeroMemory(szGroupName, sizeof(szGroupName)); + ZeroMemory(szDomainName, sizeof(szDomainName)); + + cchGroupName = 255; + cchDomainName = 255; + } + + WhoamiPrintTable(GroupTable); + + /* cleanup our allocations */ + WhoamiFree((LPVOID)pGroupInfo); + + return 0; +} + +int WhoamiPriv(void) +{ + PTOKEN_PRIVILEGES pPrivInfo = (PTOKEN_PRIVILEGES) WhoamiGetTokenInfo(TokenPrivileges); + DWORD dwResult = 0, dwIndex = 0; + WhoamiTable *PrivTable = NULL; + + if (pPrivInfo == NULL) { return 1; } + PrivTable = WhoamiAllocTable(pPrivInfo->PrivilegeCount + 1, 3); + + WhoamiPrintHeader(IDS_PRIV_HEADER); + + WhoamiSetTable(PrivTable, WhoamiLoadRcString(IDS_COL_PRIV_NAME), 0, 0); + WhoamiSetTable(PrivTable, WhoamiLoadRcString(IDS_COL_DESCRIPTION), 0, 1); + WhoamiSetTable(PrivTable, WhoamiLoadRcString(IDS_COL_STATE), 0, 2); + + for (dwIndex = 0; dwIndex < pPrivInfo->PrivilegeCount; dwIndex++) + { + PWSTR PrivName = NULL, DispName = NULL; + DWORD PrivNameSize = 0, DispNameSize = 0; + BOOL ret = FALSE; + + ret = LookupPrivilegeNameW(NULL, + &pPrivInfo->Privileges[dwIndex].Luid, + NULL, + &PrivNameSize); + + PrivName = HeapAlloc(GetProcessHeap(), 0, ++PrivNameSize*sizeof(WCHAR)); + + LookupPrivilegeNameW(NULL, + &pPrivInfo->Privileges[dwIndex].Luid, + PrivName, + &PrivNameSize); + + WhoamiSetTableDyn(PrivTable, PrivName, dwIndex + 1, 0); + + ret = LookupPrivilegeDisplayNameW(NULL, PrivName, NULL, &DispNameSize, &dwResult); + + if (!ret || GetLastError() == ERROR_NO_SUCH_PRIVILEGE) + { + DispName = HeapAlloc(GetProcessHeap(), 0, ++DispNameSize * sizeof(WCHAR)); + + LookupPrivilegeDisplayNameW(NULL, PrivName, DispName, &DispNameSize, &dwResult); + + //wprintf(L"DispName: %d %x '%s'\n", DispNameSize, GetLastError(), DispName); + + WhoamiSetTableDyn(PrivTable, DispName, dwIndex + 1, 1); + } + else + { + WhoamiSetTable(PrivTable, WhoamiLoadRcString(IDS_UNKNOWN_DESCRIPTION), dwIndex + 1, 1); + } + + if (pPrivInfo->Privileges[dwIndex].Attributes & SE_PRIVILEGE_ENABLED) + WhoamiSetTable(PrivTable, WhoamiLoadRcString(IDS_STATE_ENABLED), dwIndex + 1, 2); + else + WhoamiSetTable(PrivTable, WhoamiLoadRcString(IDS_STATE_DISABLED), dwIndex + 1, 2); + } + + WhoamiPrintTable(PrivTable); + /* cleanup our allocations */ - if (pGroupInfo) - WhoamiFree((LPVOID)pGroupInfo); - - return 0; -} - -int WhoamiPriv(void) -{ - PTOKEN_PRIVILEGES pPrivInfo = (PTOKEN_PRIVILEGES) WhoamiGetTokenInfo(TokenPrivileges); - - if (pPrivInfo) - { - DWORD dwResult = 0, dwIndex = 0; - - WhoamiTable *PrivTable = WhoamiAllocTable(pPrivInfo->PrivilegeCount + 1, 3); - - WhoamiPrintHeader(IDS_PRIV_HEADER); - - WhoamiSetTable(PrivTable, WhoamiLoadRcString(IDS_COL_PRIV_NAME), 0, 0); - WhoamiSetTable(PrivTable, WhoamiLoadRcString(IDS_COL_DESCRIPTION), 0, 1); - WhoamiSetTable(PrivTable, WhoamiLoadRcString(IDS_COL_STATE), 0, 2); - - for (dwIndex = 0; dwIndex < pPrivInfo->PrivilegeCount; dwIndex++) - { - PWSTR PrivName = NULL, DispName = NULL; - DWORD PrivNameSize = 0, DispNameSize = 0; - BOOL ret = FALSE; - - ret = LookupPrivilegeNameW(NULL, - &pPrivInfo->Privileges[dwIndex].Luid, - NULL, - &PrivNameSize); - - PrivName = HeapAlloc(GetProcessHeap(), 0, ++PrivNameSize*sizeof(WCHAR)); - - LookupPrivilegeNameW(NULL, - &pPrivInfo->Privileges[dwIndex].Luid, - PrivName, - &PrivNameSize); - - WhoamiSetTableDyn(PrivTable, PrivName, dwIndex + 1, 0); - - ret = LookupPrivilegeDisplayNameW(NULL, PrivName, NULL, &DispNameSize, &dwResult); - - if (!ret || GetLastError() == ERROR_NO_SUCH_PRIVILEGE) - { - DispName = HeapAlloc(GetProcessHeap(), 0, ++DispNameSize * sizeof(WCHAR)); - - LookupPrivilegeDisplayNameW(NULL, PrivName, DispName, &DispNameSize, &dwResult); - - //wprintf(L"DispName: %d %x '%s'\n", DispNameSize, GetLastError(), DispName); - - WhoamiSetTableDyn(PrivTable, DispName, dwIndex + 1, 1); - } - else - { - WhoamiSetTable(PrivTable, WhoamiLoadRcString(IDS_UNKNOWN_DESCRIPTION), dwIndex + 1, 1); - } - - if (pPrivInfo->Privileges[dwIndex].Attributes & SE_PRIVILEGE_ENABLED) - WhoamiSetTable(PrivTable, WhoamiLoadRcString(IDS_STATE_ENABLED), dwIndex + 1, 2); - else - WhoamiSetTable(PrivTable, WhoamiLoadRcString(IDS_STATE_DISABLED), dwIndex + 1, 2); - } - - WhoamiPrintTable(PrivTable); - } - else - { - return 1; - } - - /* cleanup our allocations */ - if (pPrivInfo) - WhoamiFree(pPrivInfo); + WhoamiFree(pPrivInfo); return 0; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs