[RAPPS]

- Added language strings to all .rc
- Replaced hardcoded strings with resource counterparts
- Fixed settings loading always default
- Fixed force update not working
- Removed hInst from LoadStringW() where possible

svn path=/branches/GSoC_2017/rapps/; revision=75673

diff --git a/reactos/base/applications/rapps/aboutdlg.cpp b/reactos/base/applications/rapps/aboutdlg.cpp
index 0325a46..02634bd 100644 (file)
--- a/reactos/base/applications/rapps/aboutdlg.cpp
+++ b/reactos/base/applications/rapps/aboutdlg.cpp
@@ -21,7 +21,7 @@ static INT_PTR CALLBACK AboutDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM
 VOID ShowAboutDialog()
 {
     DialogBoxW(hInst,
 VOID ShowAboutDialog()
 {
     DialogBoxW(hInst,

-              MAKEINTRESOURCEW(IDD_ABOUT_DIALOG),
-              hMainWnd,
-              AboutDlgProc);
+               MAKEINTRESOURCEW(IDD_ABOUT_DIALOG),
+               hMainWnd,
+               AboutDlgProc);

 }
 }

diff --git a/reactos/base/applications/rapps/available.cpp b/reactos/base/applications/rapps/available.cpp
index 44a7653..09e0d55 100644 (file)
--- a/reactos/base/applications/rapps/available.cpp
+++ b/reactos/base/applications/rapps/available.cpp
@@ -208,14 +208,22 @@ ATL::CStringW CAvailableApps::m_szSearchPath;
 
 BOOL CAvailableApps::InitializeStaticStrings()
 {
 
 BOOL CAvailableApps::InitializeStaticStrings()
 {

+
+    if (!m_szPath.IsEmpty())
+    {
+        // strings are filled
+        return TRUE;
+    }
+

     //FIXME: maybe provide a fallback?
     //FIXME: maybe provide a fallback?

-    if (m_szPath.IsEmpty() && GetStorageDirectory(m_szPath))
+    if (GetStorageDirectory(m_szPath))

     {
         m_szAppsPath = m_szPath + L"\\rapps\\";
         m_szCabPath = m_szPath + L"\\rappmgr.cab";
         m_szSearchPath = m_szAppsPath + L"*.txt";
         return TRUE;
     }
     {
         m_szAppsPath = m_szPath + L"\\rapps\\";
         m_szCabPath = m_szPath + L"\\rappmgr.cab";
         m_szSearchPath = m_szAppsPath + L"*.txt";
         return TRUE;
     }

+

     return FALSE;
 }
 
     return FALSE;
 }
 


@@ -245,8 +253,10 @@ VOID CAvailableApps::DeleteCurrentAppsDB()
     HANDLE hFind = INVALID_HANDLE_VALUE;
     WIN32_FIND_DATAW FindFileData;
 
     HANDLE hFind = INVALID_HANDLE_VALUE;
     WIN32_FIND_DATAW FindFileData;
 

-    if (m_szPath.IsEmpty())
+    if (!InitializeStaticStrings())
+    {

         return;
         return;

+    }

 
     hFind = FindFirstFileW(m_szSearchPath.GetString(), &FindFileData);
 
 
     hFind = FindFirstFileW(m_szSearchPath.GetString(), &FindFileData);
 


@@ -255,7 +265,7 @@ VOID CAvailableApps::DeleteCurrentAppsDB()
         ATL::CStringW szTmp;
         do
         {
         ATL::CStringW szTmp;
         do
         {

-            szTmp = m_szPath + FindFileData.cFileName;
+            szTmp = m_szAppsPath + FindFileData.cFileName;

             DeleteFileW(szTmp.GetString());
         } while (FindNextFileW(hFind, &FindFileData) != 0);
         FindClose(hFind);
             DeleteFileW(szTmp.GetString());
         } while (FindNextFileW(hFind, &FindFileData) != 0);
         FindClose(hFind);


@@ -270,7 +280,7 @@ BOOL CAvailableApps::UpdateAppsDB()
     HANDLE hFind = INVALID_HANDLE_VALUE;
     WIN32_FIND_DATAW FindFileData;
 
     HANDLE hFind = INVALID_HANDLE_VALUE;
     WIN32_FIND_DATAW FindFileData;
 

-    if (m_szPath.IsEmpty() && !InitializeStaticStrings())
+    if (!InitializeStaticStrings())

     {
         return FALSE;
     }
     {
         return FALSE;
     }

diff --git a/reactos/base/applications/rapps/gui.cpp b/reactos/base/applications/rapps/gui.cpp
index fd824c7..7d663a6 100644 (file)
--- a/reactos/base/applications/rapps/gui.cpp
+++ b/reactos/base/applications/rapps/gui.cpp
@@ -61,7 +61,7 @@ class CAvailableAppView
                                                       DWORD TextFlags)
     {
         ATL::CStringW szLoadedText;
                                                       DWORD TextFlags)
     {
         ATL::CStringW szLoadedText;

-        if (!szText.IsEmpty() && szLoadedText.LoadStringW(hInst, uStringID))
+        if (!szText.IsEmpty() && szLoadedText.LoadStringW(uStringID))

         {
             InsertRichEditText(szLoadedText, StringFlags);
             InsertRichEditText(szText, TextFlags);
         {
             InsertRichEditText(szLoadedText, StringFlags);
             InsertRichEditText(szText, TextFlags);


@@ -72,7 +72,7 @@ class CAvailableAppView
                                                      DWORD StringFlags)
     {
         ATL::CStringW szLoadedText;
                                                      DWORD StringFlags)
     {
         ATL::CStringW szLoadedText;

-        if (szLoadedText.LoadStringW(hInst, uStringID))
+        if (szLoadedText.LoadStringW(uStringID))

         {
             InsertRichEditText(L"\n", 0);
             InsertRichEditText(szLoadedText, StringFlags);
         {
             InsertRichEditText(L"\n", 0);
             InsertRichEditText(szLoadedText, StringFlags);


@@ -112,13 +112,13 @@ class CAvailableAppView
         switch (Info->LicenseType)
         {
         case LICENSE_TYPE::OpenSource:
         switch (Info->LicenseType)
         {
         case LICENSE_TYPE::OpenSource:

-            szLicense.LoadStringW(hInst, IDS_LICENSE_OPENSOURCE);
+            szLicense.LoadStringW(IDS_LICENSE_OPENSOURCE);

             break;
         case LICENSE_TYPE::Freeware:
             break;
         case LICENSE_TYPE::Freeware:

-            szLicense.LoadStringW(hInst, IDS_LICENSE_FREEWARE);
+            szLicense.LoadStringW(IDS_LICENSE_FREEWARE);

             break;
         case LICENSE_TYPE::Trial:
             break;
         case LICENSE_TYPE::Trial:

-            szLicense.LoadStringW(hInst, IDS_LICENSE_TRIAL);
+            szLicense.LoadStringW(IDS_LICENSE_TRIAL);

             break;
         default:
             InsertTextAfterLoaded_RichEdit(IDS_AINFO_LICENSE, Info->szLicense, CFE_BOLD, 0);
             break;
         default:
             InsertTextAfterLoaded_RichEdit(IDS_AINFO_LICENSE, Info->szLicense, CFE_BOLD, 0);


@@ -149,7 +149,9 @@ class CAvailableAppView
             szLoadedTextAvailability.LoadStringW(IDS_LANGUAGE_AVAILABLE_TRANSLATION);
             if (nTranslations > 1)
             {
             szLoadedTextAvailability.LoadStringW(IDS_LANGUAGE_AVAILABLE_TRANSLATION);
             if (nTranslations > 1)
             {

-                szLangInfo.Format(L" (+%d more)", nTranslations - 1);
+                ATL::CStringW buf;
+                buf.LoadStringW(IDS_LANGUAGE_MORE_PLACEHOLDER);
+                szLangInfo.Format(buf, nTranslations - 1);

             }
             else
             {
             }
             else
             {


@@ -162,6 +164,8 @@ class CAvailableAppView
             szLoadedTextAvailability.LoadStringW(IDS_LANGUAGE_ENGLISH_TRANSLATION);
             if (nTranslations > 1)
             {
             szLoadedTextAvailability.LoadStringW(IDS_LANGUAGE_ENGLISH_TRANSLATION);
             if (nTranslations > 1)
             {

+                ATL::CStringW buf;
+                buf.LoadStringW(IDS_LANGUAGE_AVAILABLE_PLACEHOLDER);

                 szLangInfo.Format(L" (+%d available)", nTranslations - 1);
             }
             else
                 szLangInfo.Format(L" (+%d available)", nTranslations - 1);
             }
             else


@@ -513,7 +517,7 @@ public:
         }
         return list;
     }
         }
         return list;
     }

-    
+

     PAPPLICATION_INFO GetSelectedData()
     {
         INT item = GetSelectionMark();
     PAPPLICATION_INFO GetSelectedData()
     {
         INT item = GetSelectionMark();


@@ -540,19 +544,19 @@ public:
         INT Index;
         HICON hIcon;
 
         INT Index;
         HICON hIcon;
 

-        hIcon = (HICON) LoadImage(hInst,
-                                  MAKEINTRESOURCE(IconIndex),
-                                  IMAGE_ICON,
-                                  TREEVIEW_ICON_SIZE,
-                                  TREEVIEW_ICON_SIZE,
-                                  LR_CREATEDIBSECTION);
+        hIcon = (HICON) LoadImageW(hInst,
+                                   MAKEINTRESOURCE(IconIndex),
+                                   IMAGE_ICON,
+                                   TREEVIEW_ICON_SIZE,
+                                   TREEVIEW_ICON_SIZE,
+                                   LR_CREATEDIBSECTION);

         if (hIcon)
         {
             Index = ImageList_AddIcon(hImageTreeView, hIcon);
             DestroyIcon(hIcon);
         }
 
         if (hIcon)
         {
             Index = ImageList_AddIcon(hImageTreeView, hIcon);
             DestroyIcon(hIcon);
         }
 

-        szText.LoadStringW(hInst, TextIndex);
+        szText.LoadStringW(TextIndex);

         return AddItem(hRootItem, szText, Index, Index, TextIndex);
     }
 
         return AddItem(hRootItem, szText, Index, Index, TextIndex);
     }
 


@@ -593,7 +597,7 @@ public:
                                  hInst, 0);
 
         SendMessageW(WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0);
                                  hInst, 0);
 
         SendMessageW(WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0);

-        szBuf.LoadStringW(hInst, IDS_SEARCH_TEXT);
+        szBuf.LoadStringW(IDS_SEARCH_TEXT);

         SetWindowTextW(szBuf);
         return m_hWnd;
     }
         SetWindowTextW(szBuf);
         return m_hWnd;
     }


@@ -637,13 +641,13 @@ private:
         ATL::CStringW szText;
 
         /* Add columns to ListView */
         ATL::CStringW szText;
 
         /* Add columns to ListView */

-        szText.LoadStringW(hInst, IDS_APP_NAME);
+        szText.LoadStringW(IDS_APP_NAME);

         m_ListView->AddColumn(0, szText, 200, LVCFMT_LEFT);
 
         m_ListView->AddColumn(0, szText, 200, LVCFMT_LEFT);
 

-        szText.LoadStringW(hInst, IDS_APP_INST_VERSION);
+        szText.LoadStringW(IDS_APP_INST_VERSION);

         m_ListView->AddColumn(1, szText, 90, LVCFMT_RIGHT);
 
         m_ListView->AddColumn(1, szText, 90, LVCFMT_RIGHT);
 

-        szText.LoadStringW(hInst, IDS_APP_DESCRIPTION);
+        szText.LoadStringW(IDS_APP_DESCRIPTION);

         m_ListView->AddColumn(3, szText, 250, LVCFMT_LEFT);
 
         // Unnesesary since the list updates on every TreeView selection
         m_ListView->AddColumn(3, szText, 250, LVCFMT_LEFT);
 
         // Unnesesary since the list updates on every TreeView selection


@@ -1064,12 +1068,12 @@ private:
                           In ReactOS this action is triggered whenever user changes *selection*, but should be only when *checkbox* state toggled
                           Maybe LVIS_STATEIMAGEMASK is set incorrectly
                         */
                           In ReactOS this action is triggered whenever user changes *selection*, but should be only when *checkbox* state toggled
                           Maybe LVIS_STATEIMAGEMASK is set incorrectly
                         */

-                        nSelectedApps += 
-                            (checked) 
-                            ? 1 
-                            :((nSelectedApps > 0) 
-                              ? -1 
-                              : 0);
+                        nSelectedApps +=
+                            (checked)
+                            ? 1
+                            : ((nSelectedApps > 0)
+                               ? -1
+                               : 0);

                         UpdateStatusBarText();
                     }
                 }
                         UpdateStatusBarText();
                     }
                 }


@@ -1160,7 +1164,7 @@ private:
                 if (bSearchEnabled)
                     UpdateApplicationsList(-1);
             }
                 if (bSearchEnabled)
                     UpdateApplicationsList(-1);
             }

-        break;
+            break;

         }
 
         return FALSE;
         }
 
         return FALSE;


@@ -1226,7 +1230,7 @@ private:
             {
                 ATL::CStringW szWndText;
 
             {
                 ATL::CStringW szWndText;
 

-                szBuf.LoadStringW(hInst, IDS_SEARCH_TEXT);
+                szBuf.LoadStringW(IDS_SEARCH_TEXT);

                 m_SearchBar->GetWindowTextW(szWndText);
                 if (szBuf == szWndText)
                 {
                 m_SearchBar->GetWindowTextW(szWndText);
                 if (szBuf == szWndText)
                 {


@@ -1241,7 +1245,7 @@ private:
                 m_SearchBar->GetWindowTextW(szBuf);
                 if (szBuf.IsEmpty())
                 {
                 m_SearchBar->GetWindowTextW(szBuf);
                 if (szBuf.IsEmpty())
                 {

-                    szBuf.LoadStringW(hInst, IDS_SEARCH_TEXT);
+                    szBuf.LoadStringW(IDS_SEARCH_TEXT);

                     bSearchEnabled = FALSE;
                     m_SearchBar->SetWindowTextW(szBuf.GetString());
                 }
                     bSearchEnabled = FALSE;
                     m_SearchBar->SetWindowTextW(szBuf.GetString());
                 }


@@ -1258,7 +1262,7 @@ private:
                     break;
                 }
 
                     break;
                 }
 

-                szBuf.LoadStringW(hInst, IDS_SEARCH_TEXT);
+                szBuf.LoadStringW(IDS_SEARCH_TEXT);

                 m_SearchBar->GetWindowTextW(szWndText);
                 if (szBuf == szWndText)
                 {
                 m_SearchBar->GetWindowTextW(szWndText);
                 if (szBuf == szWndText)
                 {


@@ -1304,12 +1308,12 @@ private:
             {
                 CDownloadManager::DownloadListOfApplications(m_ListView->GetCheckedItems());
                 UpdateApplicationsList(-1);
             {
                 CDownloadManager::DownloadListOfApplications(m_ListView->GetCheckedItems());
                 UpdateApplicationsList(-1);

-            } 
-            else if(CDownloadManager::DownloadApplication(m_ListView->GetSelectedData()))
+            }
+            else if (CDownloadManager::DownloadApplication(m_ListView->GetSelectedData()))

             {
                 UpdateApplicationsList(-1);
             }
             {
                 UpdateApplicationsList(-1);
             }

-            
+

             break;
 
         case ID_UNINSTALL:
             break;
 
         case ID_UNINSTALL:


@@ -1540,7 +1544,7 @@ public:
     HWND Create()
     {
         ATL::CStringW szWindowName;
     HWND Create()
     {
         ATL::CStringW szWindowName;

-        szWindowName.LoadStringW(hInst, IDS_APPTITLE);
+        szWindowName.LoadStringW(IDS_APPTITLE);

 
         RECT r = {
             (SettingsInfo.bSaveWndPos ? SettingsInfo.Left : CW_USEDEFAULT),
 
         RECT r = {
             (SettingsInfo.bSaveWndPos ? SettingsInfo.Left : CW_USEDEFAULT),

diff --git a/reactos/base/applications/rapps/include/resource.h b/reactos/base/applications/rapps/include/resource.h
index 77fa922..d2f0fdb 100644 (file)
--- a/reactos/base/applications/rapps/include/resource.h
+++ b/reactos/base/applications/rapps/include/resource.h
@@ -190,6 +190,12 @@
 #define IDS_LANGUAGE_NO_TRANSLATION             911
 #define IDS_LANGUAGE_ENGLISH_TRANSLATION        912
 #define IDS_LANGUAGE_SINGLE                     913
 #define IDS_LANGUAGE_NO_TRANSLATION             911
 #define IDS_LANGUAGE_ENGLISH_TRANSLATION        912
 #define IDS_LANGUAGE_SINGLE                     913

+#define IDS_LANGUAGE_MORE_PLACEHOLDER           914
+#define IDS_LANGUAGE_AVAILABLE_PLACEHOLDER      915
+
+/* Dialog related entries */
+#define IDS_DL_DIALOG_DB_DISP                   950
+#define IDS_DL_DIALOG_DB_DOWNLOAD_DISP          951

 
 /* Accelerators */
 #define HOTKEYS                  715
 
 /* Accelerators */
 #define HOTKEYS                  715

diff --git a/reactos/base/applications/rapps/installed.cpp b/reactos/base/applications/rapps/installed.cpp
index f255507..33b80e8 100644 (file)
--- a/reactos/base/applications/rapps/installed.cpp
+++ b/reactos/base/applications/rapps/installed.cpp
@@ -112,7 +112,7 @@ ShowInstalledAppInfo(INT Index)
 #define GET_INFO(a, b, c, d) \
     if (GetApplicationString(Info->hSubKey, a, szInfo)) \
     { \
 #define GET_INFO(a, b, c, d) \
     if (GetApplicationString(Info->hSubKey, a, szInfo)) \
     { \

-        szText.LoadStringW(hInst, b); \
+        szText.LoadStringW(b); \

         InsertRichEditText(szText, c); \
         InsertRichEditText(szInfo, d); \
     } \
         InsertRichEditText(szText, c); \
         InsertRichEditText(szInfo, d); \
     } \


@@ -152,8 +152,8 @@ RemoveAppFromRegistry(INT Index)
     Info = (PINSTALLED_INFO) ListViewGetlParam(Index);
     if (!Info || !Info->hSubKey || (ItemIndex == -1)) return;
 
     Info = (PINSTALLED_INFO) ListViewGetlParam(Index);
     if (!Info || !Info->hSubKey || (ItemIndex == -1)) return;
 

-    if (!szMsgText.LoadStringW(hInst, IDS_APP_REG_REMOVE) ||
-        !szMsgTitle.LoadStringW(hInst, IDS_INFORMATION))
+    if (!szMsgText.LoadStringW(IDS_APP_REG_REMOVE) ||
+        !szMsgTitle.LoadStringW(IDS_INFORMATION))

         return;
 
     if (MessageBoxW(hMainWnd, szMsgText, szMsgTitle, MB_YESNO | MB_ICONQUESTION) == IDYES)
         return;
 
     if (MessageBoxW(hMainWnd, szMsgText, szMsgTitle, MB_YESNO | MB_ICONQUESTION) == IDYES)


@@ -169,7 +169,7 @@ RemoveAppFromRegistry(INT Index)
             return;
         }
 
             return;
         }
 

-        if (!szMsgText.LoadStringW(hInst, IDS_UNABLE_TO_REMOVE))
+        if (!szMsgText.LoadStringW(IDS_UNABLE_TO_REMOVE))

             return;
 
         MessageBoxW(hMainWnd, szMsgText.GetString(), NULL, MB_OK | MB_ICONERROR);
             return;
 
         MessageBoxW(hMainWnd, szMsgText.GetString(), NULL, MB_OK | MB_ICONERROR);

diff --git a/reactos/base/applications/rapps/lang/bg-BG.rc b/reactos/base/applications/rapps/lang/bg-BG.rc
index 9f8d6b1..661d9e0 100644 (file)
--- a/reactos/base/applications/rapps/lang/bg-BG.rc
+++ b/reactos/base/applications/rapps/lang/bg-BG.rc
@@ -96,7 +96,7 @@ END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE

-CAPTION "Сваляне"
+CAPTION "Сваляне %ls..."

 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12


@@ -156,11 +156,13 @@ END
 STRINGTABLE
 BEGIN
     IDS_AINFO_VERSION "\nВерсия: "
 STRINGTABLE
 BEGIN
     IDS_AINFO_VERSION "\nВерсия: "

+    IDS_AINFO_AVAILABLEVERSION "\nAvailable Version: "

     IDS_AINFO_DESCRIPTION "\nОписание: "
     IDS_AINFO_SIZE "\nРазмер: "
     IDS_AINFO_URLSITE "\nДомашна страница: "
     IDS_AINFO_LICENSE "\nРазрешително: "
     IDS_AINFO_URLDOWNLOAD "\nИзтегляне: "
     IDS_AINFO_DESCRIPTION "\nОписание: "
     IDS_AINFO_SIZE "\nРазмер: "
     IDS_AINFO_URLSITE "\nДомашна страница: "
     IDS_AINFO_LICENSE "\nРазрешително: "
     IDS_AINFO_URLDOWNLOAD "\nИзтегляне: "

+    IDS_AINFO_LANGUAGES "\nLanguages: "

 END
 
 STRINGTABLE
 END
 
 STRINGTABLE


@@ -189,7 +191,7 @@ BEGIN
     IDS_INSTALL "Слагане"
     IDS_UNINSTALL "Махане"
     IDS_MODIFY "Промяна"
     IDS_INSTALL "Слагане"
     IDS_UNINSTALL "Махане"
     IDS_MODIFY "Промяна"

-    IDS_APPS_COUNT "Брой приложения: %d"
+    IDS_APPS_COUNT "Брой приложения: %d; Selected: %d"

     IDS_WELCOME_TITLE "Управителят на приложенията на РеактОС ви приветства"
     IDS_WELCOME_TEXT "Изберете раздел от лявата страна, след което изберете приложение за слагане или премахване.\nСтраницата на РеактОС: "
     IDS_WELCOME_URL "http://www.reactos.org"
     IDS_WELCOME_TITLE "Управителят на приложенията на РеактОС ви приветства"
     IDS_WELCOME_TEXT "Изберете раздел от лявата страна, след което изберете приложение за слагане или премахване.\nСтраницата на РеактОС: "
     IDS_WELCOME_URL "http://www.reactos.org"


@@ -204,9 +206,47 @@ BEGIN
     IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!"
     IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!"
     IDS_UNABLE_TO_REMOVE "Премахването на данните за приложението от регистъра е невъзможно!"
     IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!"
     IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!"
     IDS_UNABLE_TO_REMOVE "Премахването на данните за приложението от регистъра е невъзможно!"

+    IDS_UNABLE_TO_INSTALL "Unable to open installer!"

     IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed."
     IDS_INTEG_CHECK_TITLE "Verifying package integrity..."
     IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended."
     IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet."
     IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity."
     IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed."
     IDS_INTEG_CHECK_TITLE "Verifying package integrity..."
     IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended."
     IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet."
     IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity."

+    IDS_SELECT_ALL "Select/Deselect All"
+    IDS_INSTALL_SELECTED "Install Selected"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_STATUS_INSTALLED "Installed"
+    IDS_STATUS_NOTINSTALLED "Not installed"
+    IDS_STATUS_DOWNLOADED "Downloaded"
+    IDS_STATUS_UPDATE_AVAILABLE "Update available"
+    IDS_STATUS_DOWNLOADING "Downloading…"
+    IDS_STATUS_INSTALLING "Installing…"
+    IDS_STATUS_WAITING "Waiting to install…"
+    IDS_STATUS_FINISHED "Finished"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_LICENSE_OPENSOURCE "Open Source"
+    IDS_LICENSE_FREEWARE "Freeware"
+    IDS_LICENSE_TRIAL "Trial/Demo"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_LANGUAGE_AVAILABLE_TRANSLATION "Supports your language"
+    IDS_LANGUAGE_NO_TRANSLATION "Supports other languages"
+    IDS_LANGUAGE_ENGLISH_TRANSLATION "Supports English"
+    IDS_LANGUAGE_SINGLE "Single language"
+    IDS_LANGUAGE_MORE_PLACEHOLDER " (+%d more)"
+    IDS_LANGUAGE_AVAILABLE_PLACEHOLDER " (+%d available)"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_DL_DIALOG_DB_DISP "Applications Database"
+    IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Updating Database..."

 END
 END

diff --git a/reactos/base/applications/rapps/lang/cs-CZ.rc b/reactos/base/applications/rapps/lang/cs-CZ.rc
index 5742032..056f838 100644 (file)
--- a/reactos/base/applications/rapps/lang/cs-CZ.rc
+++ b/reactos/base/applications/rapps/lang/cs-CZ.rc
@@ -97,7 +97,7 @@ END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE

-CAPTION "Stahování..."
+CAPTION "Stahování %ls..."

 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12


@@ -157,11 +157,13 @@ END
 STRINGTABLE
 BEGIN
     IDS_AINFO_VERSION "\nVerze: "
 STRINGTABLE
 BEGIN
     IDS_AINFO_VERSION "\nVerze: "

+    IDS_AINFO_AVAILABLEVERSION "\nAvailable Version: "

     IDS_AINFO_DESCRIPTION "\nPopis: "
     IDS_AINFO_SIZE "\nVelikost: "
     IDS_AINFO_URLSITE "\nDomovská stránka: "
     IDS_AINFO_LICENSE "\nLicense: "
     IDS_AINFO_URLDOWNLOAD "\nStažení: "
     IDS_AINFO_DESCRIPTION "\nPopis: "
     IDS_AINFO_SIZE "\nVelikost: "
     IDS_AINFO_URLSITE "\nDomovská stránka: "
     IDS_AINFO_LICENSE "\nLicense: "
     IDS_AINFO_URLDOWNLOAD "\nStažení: "

+    IDS_AINFO_LANGUAGES "\nLanguages: "

 END
 
 STRINGTABLE
 END
 
 STRINGTABLE


@@ -190,7 +192,7 @@ BEGIN
     IDS_INSTALL "Instalovat"
     IDS_UNINSTALL "Odinstalovat"
     IDS_MODIFY "Změnit"
     IDS_INSTALL "Instalovat"
     IDS_UNINSTALL "Odinstalovat"
     IDS_MODIFY "Změnit"

-    IDS_APPS_COUNT "Počet aplikací: %d"
+    IDS_APPS_COUNT "Počet aplikací: %d; Selected: %d"

     IDS_WELCOME_TITLE "Vítejte v ReactOS Správci aplikací!\n\n"
     IDS_WELCOME_TEXT "Na levé straně zvolte kategorii, pak vpravo zvolte aplikaci, která bude nainstalována nebo odinstalována.\nWebová stránka ReactOS: "
     IDS_WELCOME_URL "http://www.reactos.org"
     IDS_WELCOME_TITLE "Vítejte v ReactOS Správci aplikací!\n\n"
     IDS_WELCOME_TEXT "Na levé straně zvolte kategorii, pak vpravo zvolte aplikaci, která bude nainstalována nebo odinstalována.\nWebová stránka ReactOS: "
     IDS_WELCOME_URL "http://www.reactos.org"


@@ -205,9 +207,47 @@ BEGIN
     IDS_UNABLE_TO_DOWNLOAD "Soubor se nepodařilo stáhnout! Adresa nenalezena!"
     IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!"
     IDS_UNABLE_TO_REMOVE "Nepodařilo se odstranit data programu z registru!"
     IDS_UNABLE_TO_DOWNLOAD "Soubor se nepodařilo stáhnout! Adresa nenalezena!"
     IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!"
     IDS_UNABLE_TO_REMOVE "Nepodařilo se odstranit data programu z registru!"

+    IDS_UNABLE_TO_INSTALL "Unable to open installer!"

     IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed."
     IDS_INTEG_CHECK_TITLE "Verifying package integrity..."
     IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended."
     IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet."
     IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity."
     IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed."
     IDS_INTEG_CHECK_TITLE "Verifying package integrity..."
     IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended."
     IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet."
     IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity."

+    IDS_SELECT_ALL "Select/Deselect All"
+    IDS_INSTALL_SELECTED "Install Selected"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_STATUS_INSTALLED "Installed"
+    IDS_STATUS_NOTINSTALLED "Not installed"
+    IDS_STATUS_DOWNLOADED "Downloaded"
+    IDS_STATUS_UPDATE_AVAILABLE "Update available"
+    IDS_STATUS_DOWNLOADING "Downloading…"
+    IDS_STATUS_INSTALLING "Installing…"
+    IDS_STATUS_WAITING "Waiting to install…"
+    IDS_STATUS_FINISHED "Finished"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_LICENSE_OPENSOURCE "Open Source"
+    IDS_LICENSE_FREEWARE "Freeware"
+    IDS_LICENSE_TRIAL "Trial/Demo"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_LANGUAGE_AVAILABLE_TRANSLATION "Supports your language"
+    IDS_LANGUAGE_NO_TRANSLATION "Supports other languages"
+    IDS_LANGUAGE_ENGLISH_TRANSLATION "Supports English"
+    IDS_LANGUAGE_SINGLE "Single language"
+    IDS_LANGUAGE_MORE_PLACEHOLDER " (+%d more)"
+    IDS_LANGUAGE_AVAILABLE_PLACEHOLDER " (+%d available)"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_DL_DIALOG_DB_DISP "Applications Database"
+    IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Updating Database..."

 END
 END

diff --git a/reactos/base/applications/rapps/lang/de-DE.rc b/reactos/base/applications/rapps/lang/de-DE.rc
index 60baf2a..be92eb2 100644 (file)
--- a/reactos/base/applications/rapps/lang/de-DE.rc
+++ b/reactos/base/applications/rapps/lang/de-DE.rc
@@ -92,7 +92,7 @@ END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE

-CAPTION "Herunterladen..."
+CAPTION "Herunterladen %ls..."

 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12


@@ -152,11 +152,13 @@ END
 STRINGTABLE
 BEGIN
     IDS_AINFO_VERSION "\nVersion: "
 STRINGTABLE
 BEGIN
     IDS_AINFO_VERSION "\nVersion: "

+    IDS_AINFO_AVAILABLEVERSION "\nAvailable Version: "

     IDS_AINFO_DESCRIPTION "\nBeschreibung: "
     IDS_AINFO_SIZE "\nGröße: "
     IDS_AINFO_URLSITE "\nHomepage: "
     IDS_AINFO_LICENSE "\nLizenz: "
     IDS_AINFO_URLDOWNLOAD "\nHerunterladen: "
     IDS_AINFO_DESCRIPTION "\nBeschreibung: "
     IDS_AINFO_SIZE "\nGröße: "
     IDS_AINFO_URLSITE "\nHomepage: "
     IDS_AINFO_LICENSE "\nLizenz: "
     IDS_AINFO_URLDOWNLOAD "\nHerunterladen: "

+    IDS_AINFO_LANGUAGES "\nLanguages: "

 END
 
 STRINGTABLE
 END
 
 STRINGTABLE


@@ -185,7 +187,7 @@ BEGIN
     IDS_INSTALL "Installieren"
     IDS_UNINSTALL "Deinstallieren"
     IDS_MODIFY "Ändern"
     IDS_INSTALL "Installieren"
     IDS_UNINSTALL "Deinstallieren"
     IDS_MODIFY "Ändern"

-    IDS_APPS_COUNT "Anzahl der Anwendungen: %d"
+    IDS_APPS_COUNT "Anzahl der Anwendungen: %d; Selected: %d"

     IDS_WELCOME_TITLE "Willkommen im ReactOS-Anwendungsmanager!\n\n"
     IDS_WELCOME_TEXT "Wählen Sie links eine Kategorie und dann eine Anwendung um sie zu installieren oder zu deinstallieren.\nReactOS-Webseite: "
     IDS_WELCOME_URL "http://www.reactos.org"
     IDS_WELCOME_TITLE "Willkommen im ReactOS-Anwendungsmanager!\n\n"
     IDS_WELCOME_TEXT "Wählen Sie links eine Kategorie und dann eine Anwendung um sie zu installieren oder zu deinstallieren.\nReactOS-Webseite: "
     IDS_WELCOME_URL "http://www.reactos.org"


@@ -200,9 +202,46 @@ BEGIN
     IDS_UNABLE_TO_DOWNLOAD "Paket konnte nicht geladen werden! Addresse wurde nicht gefunden!"
     IDS_UNABLE_TO_DOWNLOAD2 "Paket konnte nicht geladen werden! Prüfen Sie Ihre Internetverbindung!"
     IDS_UNABLE_TO_REMOVE "Konnte die Daten nicht aus der Registry löschen!"
     IDS_UNABLE_TO_DOWNLOAD "Paket konnte nicht geladen werden! Addresse wurde nicht gefunden!"
     IDS_UNABLE_TO_DOWNLOAD2 "Paket konnte nicht geladen werden! Prüfen Sie Ihre Internetverbindung!"
     IDS_UNABLE_TO_REMOVE "Konnte die Daten nicht aus der Registry löschen!"

-    IDS_CERT_DOES_NOT_MATCH "Überprüfung des SSL-Zertifikats fehlgeschlagen."
-    IDS_INTEG_CHECK_TITLE "Verifying package integrity..."
+    IDS_UNABLE_TO_INSTALL "Unable to open installer!"
+    IDS_CERT_DOES_NOT_MATCH "Überprüfung des SSL-Zertifikats fehlgeschlagen."    IDS_INTEG_CHECK_TITLE "Verifying package integrity..."

     IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended."
     IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet."
     IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity."
     IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended."
     IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet."
     IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity."

+    IDS_SELECT_ALL "Select/Deselect All"
+    IDS_INSTALL_SELECTED "Install Selected"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_STATUS_INSTALLED "Installed"
+    IDS_STATUS_NOTINSTALLED "Not installed"
+    IDS_STATUS_DOWNLOADED "Downloaded"
+    IDS_STATUS_UPDATE_AVAILABLE "Update available"
+    IDS_STATUS_DOWNLOADING "Downloading…"
+    IDS_STATUS_INSTALLING "Installing…"
+    IDS_STATUS_WAITING "Waiting to install…"
+    IDS_STATUS_FINISHED "Finished"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_LICENSE_OPENSOURCE "Open Source"
+    IDS_LICENSE_FREEWARE "Freeware"
+    IDS_LICENSE_TRIAL "Trial/Demo"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_LANGUAGE_AVAILABLE_TRANSLATION "Supports your language"
+    IDS_LANGUAGE_NO_TRANSLATION "Supports other languages"
+    IDS_LANGUAGE_ENGLISH_TRANSLATION "Supports English"
+    IDS_LANGUAGE_SINGLE "Single language"
+    IDS_LANGUAGE_MORE_PLACEHOLDER " (+%d more)"
+    IDS_LANGUAGE_AVAILABLE_PLACEHOLDER " (+%d available)"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_DL_DIALOG_DB_DISP "Applications Database"
+    IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Updating Database..."

 END
 END

diff --git a/reactos/base/applications/rapps/lang/en-US.rc b/reactos/base/applications/rapps/lang/en-US.rc
index 3937f44..a9e9937 100644 (file)
--- a/reactos/base/applications/rapps/lang/en-US.rc
+++ b/reactos/base/applications/rapps/lang/en-US.rc
@@ -237,4 +237,12 @@ BEGIN
     IDS_LANGUAGE_NO_TRANSLATION "Supports other languages"
     IDS_LANGUAGE_ENGLISH_TRANSLATION "Supports English"
     IDS_LANGUAGE_SINGLE "Single language"
     IDS_LANGUAGE_NO_TRANSLATION "Supports other languages"
     IDS_LANGUAGE_ENGLISH_TRANSLATION "Supports English"
     IDS_LANGUAGE_SINGLE "Single language"

+    IDS_LANGUAGE_MORE_PLACEHOLDER " (+%d more)"
+    IDS_LANGUAGE_AVAILABLE_PLACEHOLDER " (+%d available)"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_DL_DIALOG_DB_DISP "Applications Database"
+    IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Updating Database..."

 END
 END

diff --git a/reactos/base/applications/rapps/lang/es-ES.rc b/reactos/base/applications/rapps/lang/es-ES.rc
index 495164f..39f38a9 100644 (file)
--- a/reactos/base/applications/rapps/lang/es-ES.rc
+++ b/reactos/base/applications/rapps/lang/es-ES.rc
@@ -95,7 +95,7 @@ END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE

-CAPTION "Descargando..."
+CAPTION "Descargando %ls..."

 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12


@@ -155,11 +155,13 @@ END
 STRINGTABLE
 BEGIN
     IDS_AINFO_VERSION "\nVersión: "
 STRINGTABLE
 BEGIN
     IDS_AINFO_VERSION "\nVersión: "

+    IDS_AINFO_AVAILABLEVERSION "\nAvailable Version: "

     IDS_AINFO_DESCRIPTION "\nDescripción: "
     IDS_AINFO_SIZE "\nTamaño: "
     IDS_AINFO_URLSITE "\nPágina Web: "
     IDS_AINFO_LICENSE "\nLicencia: "
     IDS_AINFO_URLDOWNLOAD "\nDescargar: "
     IDS_AINFO_DESCRIPTION "\nDescripción: "
     IDS_AINFO_SIZE "\nTamaño: "
     IDS_AINFO_URLSITE "\nPágina Web: "
     IDS_AINFO_LICENSE "\nLicencia: "
     IDS_AINFO_URLDOWNLOAD "\nDescargar: "

+    IDS_AINFO_LANGUAGES "\nLanguages: "

 END
 
 STRINGTABLE
 END
 
 STRINGTABLE


@@ -188,7 +190,7 @@ BEGIN
     IDS_INSTALL "Instalar"
     IDS_UNINSTALL "Desinstalar"
     IDS_MODIFY "Modificar"
     IDS_INSTALL "Instalar"
     IDS_UNINSTALL "Desinstalar"
     IDS_MODIFY "Modificar"

-    IDS_APPS_COUNT "Número de aplicaciones: %d"
+    IDS_APPS_COUNT "Número de aplicaciones: %d; Selected: %d"

     IDS_WELCOME_TITLE "Bienvenido al Administrador de aplicaciones de ReactOS.\n\n"
     IDS_WELCOME_TEXT "Seleccione una categoría a la izquierda, para más tarde seleccionar la aplicación a instalar o desinstalar.\nWeb de ReactOS: "
     IDS_WELCOME_URL "http://www.reactos.org"
     IDS_WELCOME_TITLE "Bienvenido al Administrador de aplicaciones de ReactOS.\n\n"
     IDS_WELCOME_TEXT "Seleccione una categoría a la izquierda, para más tarde seleccionar la aplicación a instalar o desinstalar.\nWeb de ReactOS: "
     IDS_WELCOME_URL "http://www.reactos.org"


@@ -203,9 +205,47 @@ BEGIN
     IDS_UNABLE_TO_DOWNLOAD "No se pudo descargar el paquete. No se ha encontrado la dirección de Internet."
     IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!"
     IDS_UNABLE_TO_REMOVE "No se pudieron borrar del Registro los datos de instalación del programa."
     IDS_UNABLE_TO_DOWNLOAD "No se pudo descargar el paquete. No se ha encontrado la dirección de Internet."
     IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!"
     IDS_UNABLE_TO_REMOVE "No se pudieron borrar del Registro los datos de instalación del programa."

+    IDS_UNABLE_TO_INSTALL "Unable to open installer!"

     IDS_CERT_DOES_NOT_MATCH "Ha fallado la comprobación del certificado SSL."
     IDS_INTEG_CHECK_TITLE "Verificando integridad del paquete..."
     IDS_INTEG_CHECK_FAIL "El paquete no ha pasado la comprobación de integridad, puede haber sido alterado o estar corrupto. No se recomienda ejecutarlo."
     IDS_INTERRUPTED_DOWNLOAD "Se ha interrumpido la descarga por un error de red. Comprueba la conexión a Internet."
     IDS_UNABLE_TO_WRITE "No se ha podido escribir en el disco duro, es posible que no quede espacio libre."
     IDS_CERT_DOES_NOT_MATCH "Ha fallado la comprobación del certificado SSL."
     IDS_INTEG_CHECK_TITLE "Verificando integridad del paquete..."
     IDS_INTEG_CHECK_FAIL "El paquete no ha pasado la comprobación de integridad, puede haber sido alterado o estar corrupto. No se recomienda ejecutarlo."
     IDS_INTERRUPTED_DOWNLOAD "Se ha interrumpido la descarga por un error de red. Comprueba la conexión a Internet."
     IDS_UNABLE_TO_WRITE "No se ha podido escribir en el disco duro, es posible que no quede espacio libre."

+    IDS_SELECT_ALL "Select/Deselect All"
+    IDS_INSTALL_SELECTED "Install Selected"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_STATUS_INSTALLED "Installed"
+    IDS_STATUS_NOTINSTALLED "Not installed"
+    IDS_STATUS_DOWNLOADED "Downloaded"
+    IDS_STATUS_UPDATE_AVAILABLE "Update available"
+    IDS_STATUS_DOWNLOADING "Downloading…"
+    IDS_STATUS_INSTALLING "Installing…"
+    IDS_STATUS_WAITING "Waiting to install…"
+    IDS_STATUS_FINISHED "Finished"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_LICENSE_OPENSOURCE "Open Source"
+    IDS_LICENSE_FREEWARE "Freeware"
+    IDS_LICENSE_TRIAL "Trial/Demo"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_LANGUAGE_AVAILABLE_TRANSLATION "Supports your language"
+    IDS_LANGUAGE_NO_TRANSLATION "Supports other languages"
+    IDS_LANGUAGE_ENGLISH_TRANSLATION "Supports English"
+    IDS_LANGUAGE_SINGLE "Single language"
+    IDS_LANGUAGE_MORE_PLACEHOLDER " (+%d more)"
+    IDS_LANGUAGE_AVAILABLE_PLACEHOLDER " (+%d available)"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_DL_DIALOG_DB_DISP "Applications Database"
+    IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Updating Database..."

 END
 END

diff --git a/reactos/base/applications/rapps/lang/fr-FR.rc b/reactos/base/applications/rapps/lang/fr-FR.rc
index 6f0517d..f110ad1 100644 (file)
--- a/reactos/base/applications/rapps/lang/fr-FR.rc
+++ b/reactos/base/applications/rapps/lang/fr-FR.rc
@@ -92,7 +92,7 @@ END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE

-CAPTION "Téléchargement..."
+CAPTION "Téléchargement %ls..."

 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12


@@ -152,11 +152,13 @@ END
 STRINGTABLE
 BEGIN
     IDS_AINFO_VERSION "\nVersion : "
 STRINGTABLE
 BEGIN
     IDS_AINFO_VERSION "\nVersion : "

+    IDS_AINFO_AVAILABLEVERSION "\nAvailable Version: "

     IDS_AINFO_DESCRIPTION "\nDescription : "
     IDS_AINFO_SIZE "\nTaille : "
     IDS_AINFO_URLSITE "\nSite internet : "
     IDS_AINFO_LICENSE "\nLicence : "
     IDS_AINFO_URLDOWNLOAD "\nTélécharger : "
     IDS_AINFO_DESCRIPTION "\nDescription : "
     IDS_AINFO_SIZE "\nTaille : "
     IDS_AINFO_URLSITE "\nSite internet : "
     IDS_AINFO_LICENSE "\nLicence : "
     IDS_AINFO_URLDOWNLOAD "\nTélécharger : "

+    IDS_AINFO_LANGUAGES "\nLanguages: "

 END
 
 STRINGTABLE
 END
 
 STRINGTABLE


@@ -185,7 +187,7 @@ BEGIN
     IDS_INSTALL "Installer"
     IDS_UNINSTALL "Désinstaller"
     IDS_MODIFY "Modifier"
     IDS_INSTALL "Installer"
     IDS_UNINSTALL "Désinstaller"
     IDS_MODIFY "Modifier"

-    IDS_APPS_COUNT "Nombre d'applications : %d"
+    IDS_APPS_COUNT "Nombre d'applications : %d; Selected: %d"

     IDS_WELCOME_TITLE "Bienvenue dans ReactOS Applications Manager !\n\n"
     IDS_WELCOME_TEXT "Choisissez une catégorie à gauche, ensuite choisissez une application à installer ou désinstaller.\nSite internet de ReactOS : "
     IDS_WELCOME_URL "http://www.reactos.org"
     IDS_WELCOME_TITLE "Bienvenue dans ReactOS Applications Manager !\n\n"
     IDS_WELCOME_TEXT "Choisissez une catégorie à gauche, ensuite choisissez une application à installer ou désinstaller.\nSite internet de ReactOS : "
     IDS_WELCOME_URL "http://www.reactos.org"


@@ -200,9 +202,47 @@ BEGIN
     IDS_UNABLE_TO_DOWNLOAD "Impossible de télécharger le paquet : adresse introuvable !"
     IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!"
     IDS_UNABLE_TO_REMOVE "Impossible de supprimer du registre les données du programme !"
     IDS_UNABLE_TO_DOWNLOAD "Impossible de télécharger le paquet : adresse introuvable !"
     IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!"
     IDS_UNABLE_TO_REMOVE "Impossible de supprimer du registre les données du programme !"

+    IDS_UNABLE_TO_INSTALL "Unable to open installer!"

     IDS_CERT_DOES_NOT_MATCH "La vérification du certificat SSL a échoué."
     IDS_INTEG_CHECK_TITLE "Vérification de l'intégrité du paquet..."
     IDS_INTEG_CHECK_FAIL "Le contrôle d'intégrité du paquet a échoué, il se peut qu'il ait été corrompu ou altéré au cours du téléchargement. L'exécution du programme n'est pas recommandée."
     IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet."
     IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity."
     IDS_CERT_DOES_NOT_MATCH "La vérification du certificat SSL a échoué."
     IDS_INTEG_CHECK_TITLE "Vérification de l'intégrité du paquet..."
     IDS_INTEG_CHECK_FAIL "Le contrôle d'intégrité du paquet a échoué, il se peut qu'il ait été corrompu ou altéré au cours du téléchargement. L'exécution du programme n'est pas recommandée."
     IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet."
     IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity."

+    IDS_SELECT_ALL "Select/Deselect All"
+    IDS_INSTALL_SELECTED "Install Selected"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_STATUS_INSTALLED "Installed"
+    IDS_STATUS_NOTINSTALLED "Not installed"
+    IDS_STATUS_DOWNLOADED "Downloaded"
+    IDS_STATUS_UPDATE_AVAILABLE "Update available"
+    IDS_STATUS_DOWNLOADING "Downloading…"
+    IDS_STATUS_INSTALLING "Installing…"
+    IDS_STATUS_WAITING "Waiting to install…"
+    IDS_STATUS_FINISHED "Finished"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_LICENSE_OPENSOURCE "Open Source"
+    IDS_LICENSE_FREEWARE "Freeware"
+    IDS_LICENSE_TRIAL "Trial/Demo"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_LANGUAGE_AVAILABLE_TRANSLATION "Supports your language"
+    IDS_LANGUAGE_NO_TRANSLATION "Supports other languages"
+    IDS_LANGUAGE_ENGLISH_TRANSLATION "Supports English"
+    IDS_LANGUAGE_SINGLE "Single language"
+    IDS_LANGUAGE_MORE_PLACEHOLDER " (+%d more)"
+    IDS_LANGUAGE_AVAILABLE_PLACEHOLDER " (+%d available)"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_DL_DIALOG_DB_DISP "Applications Database"
+    IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Updating Database..."

 END
 END

diff --git a/reactos/base/applications/rapps/lang/he-IL.rc b/reactos/base/applications/rapps/lang/he-IL.rc
index fabacf5..15bf32f 100644 (file)
--- a/reactos/base/applications/rapps/lang/he-IL.rc
+++ b/reactos/base/applications/rapps/lang/he-IL.rc
@@ -94,7 +94,7 @@ END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE

-CAPTION "הורדה..."
+CAPTION "הורדה %ls..."

 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12


@@ -154,11 +154,13 @@ END
 STRINGTABLE
 BEGIN
     IDS_AINFO_VERSION "\nגרסה: "
 STRINGTABLE
 BEGIN
     IDS_AINFO_VERSION "\nגרסה: "

+    IDS_AINFO_AVAILABLEVERSION "\nAvailable Version: "

     IDS_AINFO_DESCRIPTION "\nתיאור: "
     IDS_AINFO_SIZE "\nגודל: "
     IDS_AINFO_URLSITE "\nדף בית: "
     IDS_AINFO_LICENSE "\nרישיון: "
     IDS_AINFO_URLDOWNLOAD "\nהורד: "
     IDS_AINFO_DESCRIPTION "\nתיאור: "
     IDS_AINFO_SIZE "\nגודל: "
     IDS_AINFO_URLSITE "\nדף בית: "
     IDS_AINFO_LICENSE "\nרישיון: "
     IDS_AINFO_URLDOWNLOAD "\nהורד: "

+    IDS_AINFO_LANGUAGES "\nLanguages: "

 END
 
 STRINGTABLE
 END
 
 STRINGTABLE


@@ -187,7 +189,7 @@ BEGIN
     IDS_INSTALL "התקנה"
     IDS_UNINSTALL "הסרה"
     IDS_MODIFY "שינוי"
     IDS_INSTALL "התקנה"
     IDS_UNINSTALL "הסרה"
     IDS_MODIFY "שינוי"

-    IDS_APPS_COUNT "ספירת יישומים: %d"
+    IDS_APPS_COUNT "ספירת יישומים: %d; Selected: %d"

     IDS_WELCOME_TITLE "ברוכים הבאים למנהל היישומים של ReactOS!\n\n"
     IDS_WELCOME_TEXT "Choose a category on the left, then choose an application to install or uninstall.\nReactOS Web Site: "
     IDS_WELCOME_URL "http://www.reactos.org"
     IDS_WELCOME_TITLE "ברוכים הבאים למנהל היישומים של ReactOS!\n\n"
     IDS_WELCOME_TEXT "Choose a category on the left, then choose an application to install or uninstall.\nReactOS Web Site: "
     IDS_WELCOME_URL "http://www.reactos.org"


@@ -202,9 +204,47 @@ BEGIN
     IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!"
     IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!"
     IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the registry!"
     IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!"
     IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!"
     IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the registry!"

+    IDS_UNABLE_TO_INSTALL "Unable to open installer!"

     IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed."
     IDS_INTEG_CHECK_TITLE "Verifying package integrity..."
     IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended."
     IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet."
     IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity."
     IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed."
     IDS_INTEG_CHECK_TITLE "Verifying package integrity..."
     IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended."
     IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet."
     IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity."

+    IDS_SELECT_ALL "Select/Deselect All"
+    IDS_INSTALL_SELECTED "Install Selected"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_STATUS_INSTALLED "Installed"
+    IDS_STATUS_NOTINSTALLED "Not installed"
+    IDS_STATUS_DOWNLOADED "Downloaded"
+    IDS_STATUS_UPDATE_AVAILABLE "Update available"
+    IDS_STATUS_DOWNLOADING "Downloading…"
+    IDS_STATUS_INSTALLING "Installing…"
+    IDS_STATUS_WAITING "Waiting to install…"
+    IDS_STATUS_FINISHED "Finished"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_LICENSE_OPENSOURCE "Open Source"
+    IDS_LICENSE_FREEWARE "Freeware"
+    IDS_LICENSE_TRIAL "Trial/Demo"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_LANGUAGE_AVAILABLE_TRANSLATION "Supports your language"
+    IDS_LANGUAGE_NO_TRANSLATION "Supports other languages"
+    IDS_LANGUAGE_ENGLISH_TRANSLATION "Supports English"
+    IDS_LANGUAGE_SINGLE "Single language"
+    IDS_LANGUAGE_MORE_PLACEHOLDER " (+%d more)"
+    IDS_LANGUAGE_AVAILABLE_PLACEHOLDER " (+%d available)"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_DL_DIALOG_DB_DISP "Applications Database"
+    IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Updating Database..."

 END
 END

diff --git a/reactos/base/applications/rapps/lang/it-IT.rc b/reactos/base/applications/rapps/lang/it-IT.rc
index 847973f..8832b19 100644 (file)
--- a/reactos/base/applications/rapps/lang/it-IT.rc
+++ b/reactos/base/applications/rapps/lang/it-IT.rc
@@ -92,7 +92,7 @@ END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE

-CAPTION "Scaricamento in corso"
+CAPTION "Scaricamento in corso %ls..."

 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12


@@ -152,11 +152,13 @@ END
 STRINGTABLE
 BEGIN
     IDS_AINFO_VERSION "\nVersione: "
 STRINGTABLE
 BEGIN
     IDS_AINFO_VERSION "\nVersione: "

+    IDS_AINFO_AVAILABLEVERSION "\nAvailable Version: "

     IDS_AINFO_DESCRIPTION "\nDescrizione: "
     IDS_AINFO_SIZE "\nDimensione: "
     IDS_AINFO_URLSITE "\nHome Page: "
     IDS_AINFO_LICENSE "\nLicenza: "
     IDS_AINFO_URLDOWNLOAD "\nScaricare: "
     IDS_AINFO_DESCRIPTION "\nDescrizione: "
     IDS_AINFO_SIZE "\nDimensione: "
     IDS_AINFO_URLSITE "\nHome Page: "
     IDS_AINFO_LICENSE "\nLicenza: "
     IDS_AINFO_URLDOWNLOAD "\nScaricare: "

+    IDS_AINFO_LANGUAGES "\nLanguages: "

 END
 
 STRINGTABLE
 END
 
 STRINGTABLE


@@ -185,7 +187,7 @@ BEGIN
     IDS_INSTALL "Installa"
     IDS_UNINSTALL "Rimuovi"
     IDS_MODIFY "Modifica"
     IDS_INSTALL "Installa"
     IDS_UNINSTALL "Rimuovi"
     IDS_MODIFY "Modifica"

-    IDS_APPS_COUNT "Numero applicazioni: %d"
+    IDS_APPS_COUNT "Numero applicazioni: %d; Selected: %d"

     IDS_WELCOME_TITLE "Benvenuto!\n\n"
     IDS_WELCOME_TEXT "Scegliere una categoria a sinistra, poi scegliere una applicazione da installare o disinstallare.\nReactOS Web Site: "
     IDS_WELCOME_URL "http://www.reactos.org"
     IDS_WELCOME_TITLE "Benvenuto!\n\n"
     IDS_WELCOME_TEXT "Scegliere una categoria a sinistra, poi scegliere una applicazione da installare o disinstallare.\nReactOS Web Site: "
     IDS_WELCOME_URL "http://www.reactos.org"


@@ -200,9 +202,47 @@ BEGIN
     IDS_UNABLE_TO_DOWNLOAD "Impossibile scaricare il pacchetto! Indirizzo non trovato!"
     IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!"
     IDS_UNABLE_TO_REMOVE "Impossibile cancellare i dati dal registro!"
     IDS_UNABLE_TO_DOWNLOAD "Impossibile scaricare il pacchetto! Indirizzo non trovato!"
     IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!"
     IDS_UNABLE_TO_REMOVE "Impossibile cancellare i dati dal registro!"

+    IDS_UNABLE_TO_INSTALL "Unable to open installer!"

     IDS_CERT_DOES_NOT_MATCH "Verifica del certificato SSL fallita."
     IDS_INTEG_CHECK_TITLE "Verifica integrità pacchetto..."
     IDS_INTEG_CHECK_FAIL "Il pacchetto non ha superato il controllo di integrità, potrebbe essere stato danneggiato o manomesso durante lo scaricamento. L'esecuzione del software non è raccomandata."
     IDS_INTERRUPTED_DOWNLOAD "Lo scaricamento è stato interrotto. Verificare la connessione a Internet."
     IDS_UNABLE_TO_WRITE "Impossibile scrivere su disco: lo spazio libero potrebbe essere esaurito."
     IDS_CERT_DOES_NOT_MATCH "Verifica del certificato SSL fallita."
     IDS_INTEG_CHECK_TITLE "Verifica integrità pacchetto..."
     IDS_INTEG_CHECK_FAIL "Il pacchetto non ha superato il controllo di integrità, potrebbe essere stato danneggiato o manomesso durante lo scaricamento. L'esecuzione del software non è raccomandata."
     IDS_INTERRUPTED_DOWNLOAD "Lo scaricamento è stato interrotto. Verificare la connessione a Internet."
     IDS_UNABLE_TO_WRITE "Impossibile scrivere su disco: lo spazio libero potrebbe essere esaurito."

+    IDS_SELECT_ALL "Select/Deselect All"
+    IDS_INSTALL_SELECTED "Install Selected"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_STATUS_INSTALLED "Installed"
+    IDS_STATUS_NOTINSTALLED "Not installed"
+    IDS_STATUS_DOWNLOADED "Downloaded"
+    IDS_STATUS_UPDATE_AVAILABLE "Update available"
+    IDS_STATUS_DOWNLOADING "Downloading\85"
+    IDS_STATUS_INSTALLING "Installing\85"
+    IDS_STATUS_WAITING "Waiting to install\85"
+    IDS_STATUS_FINISHED "Finished"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_LICENSE_OPENSOURCE "Open Source"
+    IDS_LICENSE_FREEWARE "Freeware"
+    IDS_LICENSE_TRIAL "Trial/Demo"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_LANGUAGE_AVAILABLE_TRANSLATION "Supports your language"
+    IDS_LANGUAGE_NO_TRANSLATION "Supports other languages"
+    IDS_LANGUAGE_ENGLISH_TRANSLATION "Supports English"
+    IDS_LANGUAGE_SINGLE "Single language"
+    IDS_LANGUAGE_MORE_PLACEHOLDER " (+%d more)"
+    IDS_LANGUAGE_AVAILABLE_PLACEHOLDER " (+%d available)"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_DL_DIALOG_DB_DISP "Applications Database"
+    IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Updating Database..."

 END
 END

diff --git a/reactos/base/applications/rapps/lang/ja-JP.rc b/reactos/base/applications/rapps/lang/ja-JP.rc
index e8e7f29..6575e9d 100644 (file)
--- a/reactos/base/applications/rapps/lang/ja-JP.rc
+++ b/reactos/base/applications/rapps/lang/ja-JP.rc
@@ -92,7 +92,7 @@ END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE

-CAPTION "ダウンロード..."
+CAPTION "ダウンロード %ls..."

 FONT 9, "MS UI Gothic"
 BEGIN
     CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12
 FONT 9, "MS UI Gothic"
 BEGIN
     CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12


@@ -152,11 +152,13 @@ END
 STRINGTABLE
 BEGIN
     IDS_AINFO_VERSION       "\nバージョン: "
 STRINGTABLE
 BEGIN
     IDS_AINFO_VERSION       "\nバージョン: "

+    IDS_AINFO_AVAILABLEVERSION "\nAvailable Version: "

     IDS_AINFO_DESCRIPTION   "\n概要: "
     IDS_AINFO_SIZE          "\nサイズ: "
     IDS_AINFO_URLSITE       "\nホームページ: "
     IDS_AINFO_LICENSE       "\nライセンス: "
     IDS_AINFO_URLDOWNLOAD    "\nダウンロード: "
     IDS_AINFO_DESCRIPTION   "\n概要: "
     IDS_AINFO_SIZE          "\nサイズ: "
     IDS_AINFO_URLSITE       "\nホームページ: "
     IDS_AINFO_LICENSE       "\nライセンス: "
     IDS_AINFO_URLDOWNLOAD    "\nダウンロード: "

+    IDS_AINFO_LANGUAGES "\nLanguages: "

 END
 
 STRINGTABLE
 END
 
 STRINGTABLE


@@ -185,7 +187,7 @@ BEGIN
     IDS_INSTALL             "インストール"
     IDS_UNINSTALL           "アンインストール"
     IDS_MODIFY              "変更"
     IDS_INSTALL             "インストール"
     IDS_UNINSTALL           "アンインストール"
     IDS_MODIFY              "変更"

-    IDS_APPS_COUNT          "アプリケーション数: %d"
+    IDS_APPS_COUNT          "アプリケーション数: %d; Selected: %d"

     IDS_WELCOME_TITLE       "ReactOS アプリケーション マネージャへようこそ!\n\n"
     IDS_WELCOME_TEXT        "左側からカテゴリを選択し、インストール又はアンインストールするアプリケーションを選んでください。\nReactOS ウェブ サイト: "
     IDS_WELCOME_URL "http://www.reactos.org"
     IDS_WELCOME_TITLE       "ReactOS アプリケーション マネージャへようこそ!\n\n"
     IDS_WELCOME_TEXT        "左側からカテゴリを選択し、インストール又はアンインストールするアプリケーションを選んでください。\nReactOS ウェブ サイト: "
     IDS_WELCOME_URL "http://www.reactos.org"


@@ -200,9 +202,47 @@ BEGIN
     IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!"
     IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!"
     IDS_UNABLE_TO_REMOVE "レジストリからこのプログラムに関するデータを削除できません!"
     IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!"
     IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!"
     IDS_UNABLE_TO_REMOVE "レジストリからこのプログラムに関するデータを削除できません!"

+    IDS_UNABLE_TO_INSTALL "Unable to open installer!"

     IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed."
     IDS_INTEG_CHECK_TITLE "Verifying package integrity..."
     IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended."
     IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet."
     IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity."
     IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed."
     IDS_INTEG_CHECK_TITLE "Verifying package integrity..."
     IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended."
     IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet."
     IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity."

+    IDS_SELECT_ALL "Select/Deselect All"
+    IDS_INSTALL_SELECTED "Install Selected"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_STATUS_INSTALLED "Installed"
+    IDS_STATUS_NOTINSTALLED "Not installed"
+    IDS_STATUS_DOWNLOADED "Downloaded"
+    IDS_STATUS_UPDATE_AVAILABLE "Update available"
+    IDS_STATUS_DOWNLOADING "Downloading…"
+    IDS_STATUS_INSTALLING "Installing…"
+    IDS_STATUS_WAITING "Waiting to install…"
+    IDS_STATUS_FINISHED "Finished"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_LICENSE_OPENSOURCE "Open Source"
+    IDS_LICENSE_FREEWARE "Freeware"
+    IDS_LICENSE_TRIAL "Trial/Demo"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_LANGUAGE_AVAILABLE_TRANSLATION "Supports your language"
+    IDS_LANGUAGE_NO_TRANSLATION "Supports other languages"
+    IDS_LANGUAGE_ENGLISH_TRANSLATION "Supports English"
+    IDS_LANGUAGE_SINGLE "Single language"
+    IDS_LANGUAGE_MORE_PLACEHOLDER " (+%d more)"
+    IDS_LANGUAGE_AVAILABLE_PLACEHOLDER " (+%d available)"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_DL_DIALOG_DB_DISP "Applications Database"
+    IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Updating Database..."

 END
 END

diff --git a/reactos/base/applications/rapps/lang/no-NO.rc b/reactos/base/applications/rapps/lang/no-NO.rc
index a272b12..d12e1d2 100644 (file)
--- a/reactos/base/applications/rapps/lang/no-NO.rc
+++ b/reactos/base/applications/rapps/lang/no-NO.rc
@@ -92,7 +92,7 @@ END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE

-CAPTION "Lastet ned..."
+CAPTION "Lastet ned %ls..."

 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12


@@ -152,6 +152,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_AINFO_VERSION "\nVersjon: "
 STRINGTABLE
 BEGIN
     IDS_AINFO_VERSION "\nVersjon: "

+    IDS_AINFO_AVAILABLEVERSION "\nAvailable Version: "

     IDS_AINFO_DESCRIPTION "\nBeskrivelse: "
     IDS_AINFO_SIZE "\nStørrelse: "
     IDS_AINFO_URLSITE "\nHjemmeside: "
     IDS_AINFO_DESCRIPTION "\nBeskrivelse: "
     IDS_AINFO_SIZE "\nStørrelse: "
     IDS_AINFO_URLSITE "\nHjemmeside: "


@@ -185,7 +186,7 @@ BEGIN
     IDS_INSTALL "Installere"
     IDS_UNINSTALL "Avinstallere"
     IDS_MODIFY "Endre"
     IDS_INSTALL "Installere"
     IDS_UNINSTALL "Avinstallere"
     IDS_MODIFY "Endre"

-    IDS_APPS_COUNT "Program oppsummering: %d"
+    IDS_APPS_COUNT "Program oppsummering: %d; Selected: %d"

     IDS_WELCOME_TITLE "Velkommen til ReactOS programbehandler!\n\n"
     IDS_WELCOME_TEXT "Velg en kategori til venstre, og velg et program for installere eller avinstallere programvaren.\nReactOS internettside: "
     IDS_WELCOME_URL "http://www.reactos.org"
     IDS_WELCOME_TITLE "Velkommen til ReactOS programbehandler!\n\n"
     IDS_WELCOME_TEXT "Velg en kategori til venstre, og velg et program for installere eller avinstallere programvaren.\nReactOS internettside: "
     IDS_WELCOME_URL "http://www.reactos.org"


@@ -200,9 +201,47 @@ BEGIN
     IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!"
     IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!"
     IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the registry!"
     IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!"
     IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!"
     IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the registry!"

+    IDS_UNABLE_TO_INSTALL "Unable to open installer!"

     IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed."
     IDS_INTEG_CHECK_TITLE "Verifying package integrity..."
     IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended."
     IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet."
     IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity."
     IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed."
     IDS_INTEG_CHECK_TITLE "Verifying package integrity..."
     IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended."
     IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet."
     IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity."

+    IDS_SELECT_ALL "Select/Deselect All"
+    IDS_INSTALL_SELECTED "Install Selected"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_STATUS_INSTALLED "Installed"
+    IDS_STATUS_NOTINSTALLED "Not installed"
+    IDS_STATUS_DOWNLOADED "Downloaded"
+    IDS_STATUS_UPDATE_AVAILABLE "Update available"
+    IDS_STATUS_DOWNLOADING "Downloading…"
+    IDS_STATUS_INSTALLING "Installing…"
+    IDS_STATUS_WAITING "Waiting to install…"
+    IDS_STATUS_FINISHED "Finished"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_LICENSE_OPENSOURCE "Open Source"
+    IDS_LICENSE_FREEWARE "Freeware"
+    IDS_LICENSE_TRIAL "Trial/Demo"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_LANGUAGE_AVAILABLE_TRANSLATION "Supports your language"
+    IDS_LANGUAGE_NO_TRANSLATION "Supports other languages"
+    IDS_LANGUAGE_ENGLISH_TRANSLATION "Supports English"
+    IDS_LANGUAGE_SINGLE "Single language"
+    IDS_LANGUAGE_MORE_PLACEHOLDER " (+%d more)"
+    IDS_LANGUAGE_AVAILABLE_PLACEHOLDER " (+%d available)"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_DL_DIALOG_DB_DISP "Applications Database"
+    IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Updating Database..."

 END
 END

diff --git a/reactos/base/applications/rapps/lang/pl-PL.rc b/reactos/base/applications/rapps/lang/pl-PL.rc
index d59a45c..ce6fa39 100644 (file)
--- a/reactos/base/applications/rapps/lang/pl-PL.rc
+++ b/reactos/base/applications/rapps/lang/pl-PL.rc
@@ -100,7 +100,7 @@ END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE

-CAPTION "Ściągnij..."
+CAPTION "Ściągnij %ls..."

 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12


@@ -160,11 +160,13 @@ END
 STRINGTABLE
 BEGIN
     IDS_AINFO_VERSION "\nWersja: "
 STRINGTABLE
 BEGIN
     IDS_AINFO_VERSION "\nWersja: "

+    IDS_AINFO_AVAILABLEVERSION "\nAvailable Version: "

     IDS_AINFO_DESCRIPTION "\nOpis: "
     IDS_AINFO_SIZE "\nRozmiar: "
     IDS_AINFO_URLSITE "\nStrona: "
     IDS_AINFO_LICENSE "\nLicencja: "
     IDS_AINFO_URLDOWNLOAD "\nPobieranie: "
     IDS_AINFO_DESCRIPTION "\nOpis: "
     IDS_AINFO_SIZE "\nRozmiar: "
     IDS_AINFO_URLSITE "\nStrona: "
     IDS_AINFO_LICENSE "\nLicencja: "
     IDS_AINFO_URLDOWNLOAD "\nPobieranie: "

+    IDS_AINFO_LANGUAGES "\nLanguages: "

 END
 
 STRINGTABLE
 END
 
 STRINGTABLE


@@ -208,9 +210,47 @@ BEGIN
     IDS_UNABLE_TO_DOWNLOAD "Nie można pobrać pakietu! Nie znaleziono adresu!"
     IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!"
     IDS_UNABLE_TO_REMOVE "Nie można było usunąć wpisu z rejestru!"
     IDS_UNABLE_TO_DOWNLOAD "Nie można pobrać pakietu! Nie znaleziono adresu!"
     IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!"
     IDS_UNABLE_TO_REMOVE "Nie można było usunąć wpisu z rejestru!"

+    IDS_UNABLE_TO_INSTALL "Unable to open installer!"

     IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed."
     IDS_INTEG_CHECK_TITLE "Verifying package integrity..."
     IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended."
     IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet."
     IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity."
     IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed."
     IDS_INTEG_CHECK_TITLE "Verifying package integrity..."
     IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended."
     IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet."
     IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity."

+    IDS_SELECT_ALL "Select/Deselect All"
+    IDS_INSTALL_SELECTED "Install Selected"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_STATUS_INSTALLED "Installed"
+    IDS_STATUS_NOTINSTALLED "Not installed"
+    IDS_STATUS_DOWNLOADED "Downloaded"
+    IDS_STATUS_UPDATE_AVAILABLE "Update available"
+    IDS_STATUS_DOWNLOADING "Downloading…"
+    IDS_STATUS_INSTALLING "Installing…"
+    IDS_STATUS_WAITING "Waiting to install…"
+    IDS_STATUS_FINISHED "Finished"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_LICENSE_OPENSOURCE "Open Source"
+    IDS_LICENSE_FREEWARE "Freeware"
+    IDS_LICENSE_TRIAL "Trial/Demo"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_LANGUAGE_AVAILABLE_TRANSLATION "Supports your language"
+    IDS_LANGUAGE_NO_TRANSLATION "Supports other languages"
+    IDS_LANGUAGE_ENGLISH_TRANSLATION "Supports English"
+    IDS_LANGUAGE_SINGLE "Single language"
+    IDS_LANGUAGE_MORE_PLACEHOLDER " (+%d more)"
+    IDS_LANGUAGE_AVAILABLE_PLACEHOLDER " (+%d available)"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_DL_DIALOG_DB_DISP "Applications Database"
+    IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Updating Database..."

 END
 END

diff --git a/reactos/base/applications/rapps/lang/pt-BR.rc b/reactos/base/applications/rapps/lang/pt-BR.rc
index b7fe9b6..7388606 100644 (file)
--- a/reactos/base/applications/rapps/lang/pt-BR.rc
+++ b/reactos/base/applications/rapps/lang/pt-BR.rc
@@ -94,7 +94,7 @@ END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE

-CAPTION "Download..."
+CAPTION "Download %ls..."

 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12


@@ -154,11 +154,13 @@ END
 STRINGTABLE
 BEGIN
     IDS_AINFO_VERSION "\nVersão: "
 STRINGTABLE
 BEGIN
     IDS_AINFO_VERSION "\nVersão: "

+    IDS_AINFO_AVAILABLEVERSION "\nAvailable Version: "

     IDS_AINFO_DESCRIPTION "\nDescrição: "
     IDS_AINFO_SIZE "\nTamanho: "
     IDS_AINFO_URLSITE "\nPágina: "
     IDS_AINFO_LICENSE "\nLicença: "
     IDS_AINFO_URLDOWNLOAD "\nTransferir: "
     IDS_AINFO_DESCRIPTION "\nDescrição: "
     IDS_AINFO_SIZE "\nTamanho: "
     IDS_AINFO_URLSITE "\nPágina: "
     IDS_AINFO_LICENSE "\nLicença: "
     IDS_AINFO_URLDOWNLOAD "\nTransferir: "

+    IDS_AINFO_LANGUAGES "\nLanguages: "

 END
 
 STRINGTABLE
 END
 
 STRINGTABLE


@@ -187,7 +189,7 @@ BEGIN
     IDS_INSTALL "Instalar"
     IDS_UNINSTALL "Desinstalar"
     IDS_MODIFY "Modificar"
     IDS_INSTALL "Instalar"
     IDS_UNINSTALL "Desinstalar"
     IDS_MODIFY "Modificar"

-    IDS_APPS_COUNT "Número de aplicativos: %d"
+    IDS_APPS_COUNT "Número de aplicativos: %d; Selected: %d"

     IDS_WELCOME_TITLE "Bem-vindo(a) a Central de Aplicativos ReactOS!\n\n"
     IDS_WELCOME_TEXT "Escolha uma categoria à esquerda, então escolha um aplicativo para instalar ou desinstalar.\nWeb Site ReactOS: "
     IDS_WELCOME_URL "http://www.reactos.org"
     IDS_WELCOME_TITLE "Bem-vindo(a) a Central de Aplicativos ReactOS!\n\n"
     IDS_WELCOME_TEXT "Escolha uma categoria à esquerda, então escolha um aplicativo para instalar ou desinstalar.\nWeb Site ReactOS: "
     IDS_WELCOME_URL "http://www.reactos.org"


@@ -202,9 +204,47 @@ BEGIN
     IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!"
     IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!"
     IDS_UNABLE_TO_REMOVE "Não foi possível remover as informações do programa do registro!"
     IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!"
     IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!"
     IDS_UNABLE_TO_REMOVE "Não foi possível remover as informações do programa do registro!"

+    IDS_UNABLE_TO_INSTALL "Unable to open installer!"

     IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed."
     IDS_INTEG_CHECK_TITLE "Verifying package integrity..."
     IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended."
     IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet."
     IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity."
     IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed."
     IDS_INTEG_CHECK_TITLE "Verifying package integrity..."
     IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended."
     IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet."
     IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity."

+    IDS_SELECT_ALL "Select/Deselect All"
+    IDS_INSTALL_SELECTED "Install Selected"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_STATUS_INSTALLED "Installed"
+    IDS_STATUS_NOTINSTALLED "Not installed"
+    IDS_STATUS_DOWNLOADED "Downloaded"
+    IDS_STATUS_UPDATE_AVAILABLE "Update available"
+    IDS_STATUS_DOWNLOADING "Downloading…"
+    IDS_STATUS_INSTALLING "Installing…"
+    IDS_STATUS_WAITING "Waiting to install…"
+    IDS_STATUS_FINISHED "Finished"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_LICENSE_OPENSOURCE "Open Source"
+    IDS_LICENSE_FREEWARE "Freeware"
+    IDS_LICENSE_TRIAL "Trial/Demo"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_LANGUAGE_AVAILABLE_TRANSLATION "Supports your language"
+    IDS_LANGUAGE_NO_TRANSLATION "Supports other languages"
+    IDS_LANGUAGE_ENGLISH_TRANSLATION "Supports English"
+    IDS_LANGUAGE_SINGLE "Single language"
+    IDS_LANGUAGE_MORE_PLACEHOLDER " (+%d more)"
+    IDS_LANGUAGE_AVAILABLE_PLACEHOLDER " (+%d available)"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_DL_DIALOG_DB_DISP "Applications Database"
+    IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Updating Database..."

 END
 END

diff --git a/reactos/base/applications/rapps/lang/ro-RO.rc b/reactos/base/applications/rapps/lang/ro-RO.rc
index 2e7df8e..4c4d7fc 100644 (file)
--- a/reactos/base/applications/rapps/lang/ro-RO.rc
+++ b/reactos/base/applications/rapps/lang/ro-RO.rc
@@ -98,7 +98,7 @@ END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE

-CAPTION "În descărcare…"
+CAPTION "În descărcare %ls..."

 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12


@@ -158,11 +158,13 @@ END
 STRINGTABLE
 BEGIN
     IDS_AINFO_VERSION "\nVersiune: "
 STRINGTABLE
 BEGIN
     IDS_AINFO_VERSION "\nVersiune: "

+    IDS_AINFO_AVAILABLEVERSION "\nAvailable Version: "

     IDS_AINFO_DESCRIPTION "\nDescriere: "
     IDS_AINFO_SIZE "\nDimensiune: "
     IDS_AINFO_URLSITE "\nPagină web: "
     IDS_AINFO_LICENSE "\nLicență: "
     IDS_AINFO_URLDOWNLOAD "\nDescarca: "
     IDS_AINFO_DESCRIPTION "\nDescriere: "
     IDS_AINFO_SIZE "\nDimensiune: "
     IDS_AINFO_URLSITE "\nPagină web: "
     IDS_AINFO_LICENSE "\nLicență: "
     IDS_AINFO_URLDOWNLOAD "\nDescarca: "

+    IDS_AINFO_LANGUAGES "\nLanguages: "

 END
 
 STRINGTABLE
 END
 
 STRINGTABLE


@@ -191,7 +193,7 @@ BEGIN
     IDS_INSTALL "Instalează"
     IDS_UNINSTALL "Dezinstalează"
     IDS_MODIFY "Modifică"
     IDS_INSTALL "Instalează"
     IDS_UNINSTALL "Dezinstalează"
     IDS_MODIFY "Modifică"

-    IDS_APPS_COUNT "Numărul de programe: %d"
+    IDS_APPS_COUNT "Numărul de programe: %d; Selected: %d"

     IDS_WELCOME_TITLE "Bun venit la gestionarul de programe ReactOS!\n\n"
     IDS_WELCOME_TEXT "Alegeți o categorie din stânga, apoi alegeți o aplicație pentru a o instala sau dezinstala.\nArdesa web ReactOS: "
     IDS_WELCOME_URL "http://www.reactos.org"
     IDS_WELCOME_TITLE "Bun venit la gestionarul de programe ReactOS!\n\n"
     IDS_WELCOME_TEXT "Alegeți o categorie din stânga, apoi alegeți o aplicație pentru a o instala sau dezinstala.\nArdesa web ReactOS: "
     IDS_WELCOME_URL "http://www.reactos.org"


@@ -206,9 +208,47 @@ BEGIN
     IDS_UNABLE_TO_DOWNLOAD "Pachetul nu poate fi descărcat! Adresa nu este găsită!"
     IDS_UNABLE_TO_DOWNLOAD2 "Pachetul nu poate fi descărcat! Verificați conexiunea de Internet!"
     IDS_UNABLE_TO_REMOVE "Datele de registru pentru acest program nu au putut fi eliminate!"
     IDS_UNABLE_TO_DOWNLOAD "Pachetul nu poate fi descărcat! Adresa nu este găsită!"
     IDS_UNABLE_TO_DOWNLOAD2 "Pachetul nu poate fi descărcat! Verificați conexiunea de Internet!"
     IDS_UNABLE_TO_REMOVE "Datele de registru pentru acest program nu au putut fi eliminate!"

+    IDS_UNABLE_TO_INSTALL "Unable to open installer!"

     IDS_CERT_DOES_NOT_MATCH "Verificarea certificatului SSL a eșuat."    
     IDS_INTEG_CHECK_TITLE "Integritatea pachetului în verificare…"
     IDS_INTEG_CHECK_FAIL "Pachetul nu a trecut de verificarea de integritate. Utilizarea programului nu este recomandată."
     IDS_INTERRUPTED_DOWNLOAD "Descărcarea a fost întreruptă. Verificați conexiunea la Internet."
     IDS_UNABLE_TO_WRITE "Eșec la scriea pe disc. Una din cauze poate fi atingerea limitei de capacitate."
     IDS_CERT_DOES_NOT_MATCH "Verificarea certificatului SSL a eșuat."    
     IDS_INTEG_CHECK_TITLE "Integritatea pachetului în verificare…"
     IDS_INTEG_CHECK_FAIL "Pachetul nu a trecut de verificarea de integritate. Utilizarea programului nu este recomandată."
     IDS_INTERRUPTED_DOWNLOAD "Descărcarea a fost întreruptă. Verificați conexiunea la Internet."
     IDS_UNABLE_TO_WRITE "Eșec la scriea pe disc. Una din cauze poate fi atingerea limitei de capacitate."

+    IDS_SELECT_ALL "Select/Deselect All"
+    IDS_INSTALL_SELECTED "Install Selected"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_STATUS_INSTALLED "Installed"
+    IDS_STATUS_NOTINSTALLED "Not installed"
+    IDS_STATUS_DOWNLOADED "Downloaded"
+    IDS_STATUS_UPDATE_AVAILABLE "Update available"
+    IDS_STATUS_DOWNLOADING "Downloading…"
+    IDS_STATUS_INSTALLING "Installing…"
+    IDS_STATUS_WAITING "Waiting to install…"
+    IDS_STATUS_FINISHED "Finished"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_LICENSE_OPENSOURCE "Open Source"
+    IDS_LICENSE_FREEWARE "Freeware"
+    IDS_LICENSE_TRIAL "Trial/Demo"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_LANGUAGE_AVAILABLE_TRANSLATION "Supports your language"
+    IDS_LANGUAGE_NO_TRANSLATION "Supports other languages"
+    IDS_LANGUAGE_ENGLISH_TRANSLATION "Supports English"
+    IDS_LANGUAGE_SINGLE "Single language"
+    IDS_LANGUAGE_MORE_PLACEHOLDER " (+%d more)"
+    IDS_LANGUAGE_AVAILABLE_PLACEHOLDER " (+%d available)"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_DL_DIALOG_DB_DISP "Applications Database"
+    IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Updating Database..."

 END
 END

diff --git a/reactos/base/applications/rapps/lang/ru-RU.rc b/reactos/base/applications/rapps/lang/ru-RU.rc
index f85605d..636573f 100644 (file)
--- a/reactos/base/applications/rapps/lang/ru-RU.rc
+++ b/reactos/base/applications/rapps/lang/ru-RU.rc
@@ -158,6 +158,7 @@ BEGIN
     IDS_AINFO_URLSITE "\nДомашняя страница: "
     IDS_AINFO_LICENSE "\nЛицензия: "
     IDS_AINFO_URLDOWNLOAD "\nЗагрузить: "
     IDS_AINFO_URLSITE "\nДомашняя страница: "
     IDS_AINFO_LICENSE "\nЛицензия: "
     IDS_AINFO_URLDOWNLOAD "\nЗагрузить: "

+    IDS_AINFO_LANGUAGES "\nЯзыки: "

 END
 
 STRINGTABLE
 END
 
 STRINGTABLE


@@ -200,13 +201,15 @@ BEGIN
     IDS_INFORMATION "Информация"
     IDS_UNABLE_TO_DOWNLOAD "Не удалось скачать приложение! Не найден адрес!"
     IDS_UNABLE_TO_DOWNLOAD2 "Не удалось скачать приложение! Проверьте подключение к сети Интернет!"
     IDS_INFORMATION "Информация"
     IDS_UNABLE_TO_DOWNLOAD "Не удалось скачать приложение! Не найден адрес!"
     IDS_UNABLE_TO_DOWNLOAD2 "Не удалось скачать приложение! Проверьте подключение к сети Интернет!"

-    IDS_UNABLE_TO_INSTALL "Unable to open installer!"

     IDS_UNABLE_TO_REMOVE "Не удалось удалить данные о программе из реестра!"
     IDS_UNABLE_TO_REMOVE "Не удалось удалить данные о программе из реестра!"

+    IDS_UNABLE_TO_INSTALL "Не удалось завершить установку!"

     IDS_CERT_DOES_NOT_MATCH "Ошибка проверки SSL сертификата."
     IDS_INTEG_CHECK_TITLE "Проверка целостности приложения..."
     IDS_INTEG_CHECK_FAIL "Приложение не прошло проверку целостности, возможно оно было повреждено или подменено. Запуск приложения не рекомендуется."
     IDS_INTERRUPTED_DOWNLOAD "Загрузка была прервана. Проверьте подключение к сети Интернет."
     IDS_UNABLE_TO_WRITE "Не удалось записать данные на диск. Возможно, недостаточно свободного места на диске."
     IDS_CERT_DOES_NOT_MATCH "Ошибка проверки SSL сертификата."
     IDS_INTEG_CHECK_TITLE "Проверка целостности приложения..."
     IDS_INTEG_CHECK_FAIL "Приложение не прошло проверку целостности, возможно оно было повреждено или подменено. Запуск приложения не рекомендуется."
     IDS_INTERRUPTED_DOWNLOAD "Загрузка была прервана. Проверьте подключение к сети Интернет."
     IDS_UNABLE_TO_WRITE "Не удалось записать данные на диск. Возможно, недостаточно свободного места на диске."

+    IDS_SELECT_ALL "Выбрать все"
+    IDS_INSTALL_SELECTED "Установить выбранное"

 END
 
 STRINGTABLE
 END
 
 STRINGTABLE


@@ -216,7 +219,7 @@ BEGIN
     IDS_STATUS_DOWNLOADED "Загружено"
     IDS_STATUS_UPDATE_AVAILABLE "Есть обновления"
     IDS_STATUS_DOWNLOADING "Загружается…"
     IDS_STATUS_DOWNLOADED "Загружено"
     IDS_STATUS_UPDATE_AVAILABLE "Есть обновления"
     IDS_STATUS_DOWNLOADING "Загружается…"

-    IDS_STATUS_INSTALLING "Установка…"
+    IDS_STATUS_INSTALLING "Установка..."

     IDS_STATUS_WAITING "Ожидание установки…"
     IDS_STATUS_FINISHED "Завершено"
 END
     IDS_STATUS_WAITING "Ожидание установки…"
     IDS_STATUS_FINISHED "Завершено"
 END


@@ -234,4 +237,12 @@ BEGIN
     IDS_LANGUAGE_NO_TRANSLATION "Доступно на других языках"
     IDS_LANGUAGE_ENGLISH_TRANSLATION "Доступно на Английском"
     IDS_LANGUAGE_SINGLE "Один язык"
     IDS_LANGUAGE_NO_TRANSLATION "Доступно на других языках"
     IDS_LANGUAGE_ENGLISH_TRANSLATION "Доступно на Английском"
     IDS_LANGUAGE_SINGLE "Один язык"

-END
\ No newline at end of file
+    IDS_LANGUAGE_MORE_PLACEHOLDER " (+еще %d )
+    IDS_LANGUAGE_AVAILABLE_PLACEHOLDER " (+%d доступно)"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_DL_DIALOG_DB_DISP "База данных приложений"
+    IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Обновление базы данных..."
+END

diff --git a/reactos/base/applications/rapps/lang/sk-SK.rc b/reactos/base/applications/rapps/lang/sk-SK.rc
index 82825d3..150150e 100644 (file)
--- a/reactos/base/applications/rapps/lang/sk-SK.rc
+++ b/reactos/base/applications/rapps/lang/sk-SK.rc
@@ -97,7 +97,7 @@ END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE

-CAPTION "Sťahujem ..." // Stiahnuť ???
+CAPTION "Sťahujem %ls..." // Stiahnuť ???

 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12


@@ -157,11 +157,13 @@ END
 STRINGTABLE
 BEGIN
     IDS_AINFO_VERSION "\nVerzia: "
 STRINGTABLE
 BEGIN
     IDS_AINFO_VERSION "\nVerzia: "

+    IDS_AINFO_AVAILABLEVERSION "\nAvailable Version: "

     IDS_AINFO_DESCRIPTION "\nPopis: "
     IDS_AINFO_SIZE "\nVeľkosť: "
     IDS_AINFO_URLSITE "\nDomovská stránka: "
     IDS_AINFO_LICENSE "\nLicencia: "
     IDS_AINFO_URLDOWNLOAD "\nStiahnuť: "
     IDS_AINFO_DESCRIPTION "\nPopis: "
     IDS_AINFO_SIZE "\nVeľkosť: "
     IDS_AINFO_URLSITE "\nDomovská stránka: "
     IDS_AINFO_LICENSE "\nLicencia: "
     IDS_AINFO_URLDOWNLOAD "\nStiahnuť: "

+    IDS_AINFO_LANGUAGES "\nLanguages: "

 END
 
 STRINGTABLE
 END
 
 STRINGTABLE


@@ -190,7 +192,7 @@ BEGIN
     IDS_INSTALL "Inštalovať"
     IDS_UNINSTALL "Odinštalovať"
     IDS_MODIFY "Zmeniť"
     IDS_INSTALL "Inštalovať"
     IDS_UNINSTALL "Odinštalovať"
     IDS_MODIFY "Zmeniť"

-    IDS_APPS_COUNT "Počet programov: %d"
+    IDS_APPS_COUNT "Počet programov: %d; Selected: %d"

     IDS_WELCOME_TITLE "Víta Vás Manažér aplikácií systému ReactOS!\n\n" // ReactOS Application Manager
     IDS_WELCOME_TEXT "Vyberte si kategóriu na ľavej strane, potom vyberte aplikáciu, ktorú chcete nainštalovať alebo odinštalovať.\nWebstránka projektu ReactOS: "
     IDS_WELCOME_URL "http://www.reactos.org"
     IDS_WELCOME_TITLE "Víta Vás Manažér aplikácií systému ReactOS!\n\n" // ReactOS Application Manager
     IDS_WELCOME_TEXT "Vyberte si kategóriu na ľavej strane, potom vyberte aplikáciu, ktorú chcete nainštalovať alebo odinštalovať.\nWebstránka projektu ReactOS: "
     IDS_WELCOME_URL "http://www.reactos.org"


@@ -205,9 +207,47 @@ BEGIN
     IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!"
     IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!"
     IDS_UNABLE_TO_REMOVE "Nie je možné odstrániť z registrov údaje o programe!"
     IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!"
     IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!"
     IDS_UNABLE_TO_REMOVE "Nie je možné odstrániť z registrov údaje o programe!"

+    IDS_UNABLE_TO_INSTALL "Unable to open installer!"

     IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed."
     IDS_INTEG_CHECK_TITLE "Verifying package integrity..."
     IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended."
     IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet."
     IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity."
     IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed."
     IDS_INTEG_CHECK_TITLE "Verifying package integrity..."
     IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended."
     IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet."
     IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity."

+    IDS_SELECT_ALL "Select/Deselect All"
+    IDS_INSTALL_SELECTED "Install Selected"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_STATUS_INSTALLED "Installed"
+    IDS_STATUS_NOTINSTALLED "Not installed"
+    IDS_STATUS_DOWNLOADED "Downloaded"
+    IDS_STATUS_UPDATE_AVAILABLE "Update available"
+    IDS_STATUS_DOWNLOADING "Downloading…"
+    IDS_STATUS_INSTALLING "Installing…"
+    IDS_STATUS_WAITING "Waiting to install…"
+    IDS_STATUS_FINISHED "Finished"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_LICENSE_OPENSOURCE "Open Source"
+    IDS_LICENSE_FREEWARE "Freeware"
+    IDS_LICENSE_TRIAL "Trial/Demo"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_LANGUAGE_AVAILABLE_TRANSLATION "Supports your language"
+    IDS_LANGUAGE_NO_TRANSLATION "Supports other languages"
+    IDS_LANGUAGE_ENGLISH_TRANSLATION "Supports English"
+    IDS_LANGUAGE_SINGLE "Single language"
+    IDS_LANGUAGE_MORE_PLACEHOLDER " (+%d more)"
+    IDS_LANGUAGE_AVAILABLE_PLACEHOLDER " (+%d available)"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_DL_DIALOG_DB_DISP "Applications Database"
+    IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Updating Database..."

 END
 END

diff --git a/reactos/base/applications/rapps/lang/sq-AL.rc b/reactos/base/applications/rapps/lang/sq-AL.rc
index 782fe48..80de114 100644 (file)
--- a/reactos/base/applications/rapps/lang/sq-AL.rc
+++ b/reactos/base/applications/rapps/lang/sq-AL.rc
@@ -96,7 +96,7 @@ END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE

-CAPTION "Shkarko..."
+CAPTION "Shkarko %ls..."

 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12


@@ -156,11 +156,13 @@ END
 STRINGTABLE
 BEGIN
     IDS_AINFO_VERSION "\nVersioni: "
 STRINGTABLE
 BEGIN
     IDS_AINFO_VERSION "\nVersioni: "

+    IDS_AINFO_AVAILABLEVERSION "\nAvailable Version: "

     IDS_AINFO_DESCRIPTION "\nPershkrimi: "
     IDS_AINFO_SIZE "\nMasa: "
     IDS_AINFO_URLSITE "\nHome Page: "
     IDS_AINFO_LICENSE "\nLicenca: "
     IDS_AINFO_URLDOWNLOAD "\nShkarko: "
     IDS_AINFO_DESCRIPTION "\nPershkrimi: "
     IDS_AINFO_SIZE "\nMasa: "
     IDS_AINFO_URLSITE "\nHome Page: "
     IDS_AINFO_LICENSE "\nLicenca: "
     IDS_AINFO_URLDOWNLOAD "\nShkarko: "

+    IDS_AINFO_LANGUAGES "\nLanguages: "

 END
 
 STRINGTABLE
 END
 
 STRINGTABLE


@@ -189,7 +191,7 @@ BEGIN
     IDS_INSTALL "Instalo"
     IDS_UNINSTALL "Uninstall"
     IDS_MODIFY "Modifiko"
     IDS_INSTALL "Instalo"
     IDS_UNINSTALL "Uninstall"
     IDS_MODIFY "Modifiko"

-    IDS_APPS_COUNT "Numrimi Aplicacioneve: %d"
+    IDS_APPS_COUNT "Numrimi Aplicacioneve: %d; Selected: %d"

     IDS_WELCOME_TITLE "Mire Se Erdhe ne ReactOS Applications Manager!\n\n"
     IDS_WELCOME_TEXT "Zgjidh nje kategori ne te majte, pastaj zgjidh nje aplicacion per ta instaluar ose uninstall.\nReactOS Web Site: "
     IDS_WELCOME_URL "http://www.reactos.org"
     IDS_WELCOME_TITLE "Mire Se Erdhe ne ReactOS Applications Manager!\n\n"
     IDS_WELCOME_TEXT "Zgjidh nje kategori ne te majte, pastaj zgjidh nje aplicacion per ta instaluar ose uninstall.\nReactOS Web Site: "
     IDS_WELCOME_URL "http://www.reactos.org"


@@ -204,9 +206,47 @@ BEGIN
     IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!"
     IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!"
     IDS_UNABLE_TO_REMOVE "E pamundur te fshihen informacionet e programit nga regjistri!"
     IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!"
     IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!"
     IDS_UNABLE_TO_REMOVE "E pamundur te fshihen informacionet e programit nga regjistri!"

+    IDS_UNABLE_TO_INSTALL "Unable to open installer!"

     IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed."
     IDS_INTEG_CHECK_TITLE "Verifying package integrity..."
     IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended."
     IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet."
     IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity."
     IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed."
     IDS_INTEG_CHECK_TITLE "Verifying package integrity..."
     IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended."
     IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet."
     IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity."

+    IDS_SELECT_ALL "Select/Deselect All"
+    IDS_INSTALL_SELECTED "Install Selected"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_STATUS_INSTALLED "Installed"
+    IDS_STATUS_NOTINSTALLED "Not installed"
+    IDS_STATUS_DOWNLOADED "Downloaded"
+    IDS_STATUS_UPDATE_AVAILABLE "Update available"
+    IDS_STATUS_DOWNLOADING "Downloading…"
+    IDS_STATUS_INSTALLING "Installing…"
+    IDS_STATUS_WAITING "Waiting to install…"
+    IDS_STATUS_FINISHED "Finished"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_LICENSE_OPENSOURCE "Open Source"
+    IDS_LICENSE_FREEWARE "Freeware"
+    IDS_LICENSE_TRIAL "Trial/Demo"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_LANGUAGE_AVAILABLE_TRANSLATION "Supports your language"
+    IDS_LANGUAGE_NO_TRANSLATION "Supports other languages"
+    IDS_LANGUAGE_ENGLISH_TRANSLATION "Supports English"
+    IDS_LANGUAGE_SINGLE "Single language"
+    IDS_LANGUAGE_MORE_PLACEHOLDER " (+%d more)"
+    IDS_LANGUAGE_AVAILABLE_PLACEHOLDER " (+%d available)"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_DL_DIALOG_DB_DISP "Applications Database"
+    IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Updating Database..."

 END
 END

diff --git a/reactos/base/applications/rapps/lang/sv-SE.rc b/reactos/base/applications/rapps/lang/sv-SE.rc
index 685065b..c321420 100644 (file)
--- a/reactos/base/applications/rapps/lang/sv-SE.rc
+++ b/reactos/base/applications/rapps/lang/sv-SE.rc
@@ -99,7 +99,7 @@ END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE

-CAPTION "Ladda ner..."
+CAPTION "Ladda ner %ls..."

 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12


@@ -159,11 +159,13 @@ END
 STRINGTABLE
 BEGIN
     IDS_AINFO_VERSION "\nVersion: "
 STRINGTABLE
 BEGIN
     IDS_AINFO_VERSION "\nVersion: "

+    IDS_AINFO_AVAILABLEVERSION "\nAvailable Version: "

     IDS_AINFO_DESCRIPTION "\nBeskrivning: "
     IDS_AINFO_SIZE "\nStorlek: "
     IDS_AINFO_URLSITE "\nHemsida: "
     IDS_AINFO_LICENSE "\nLicens: "
     IDS_AINFO_URLDOWNLOAD "\nLadda ner: "
     IDS_AINFO_DESCRIPTION "\nBeskrivning: "
     IDS_AINFO_SIZE "\nStorlek: "
     IDS_AINFO_URLSITE "\nHemsida: "
     IDS_AINFO_LICENSE "\nLicens: "
     IDS_AINFO_URLDOWNLOAD "\nLadda ner: "

+    IDS_AINFO_LANGUAGES "\nLanguages: "

 END
 
 STRINGTABLE
 END
 
 STRINGTABLE


@@ -192,7 +194,7 @@ BEGIN
     IDS_INSTALL "Installera"
     IDS_UNINSTALL "Avinstallera"
     IDS_MODIFY "Ändra"
     IDS_INSTALL "Installera"
     IDS_UNINSTALL "Avinstallera"
     IDS_MODIFY "Ändra"

-    IDS_APPS_COUNT "Programantal: %d"
+    IDS_APPS_COUNT "Programantal: %d; Selected: %d"

     IDS_WELCOME_TITLE "Välkommen till ReactOS programhanterare!\n\n"
     IDS_WELCOME_TEXT "Välj en kategori till vänster, och sedan ett program för att installera eller avinstallera.\nReactOS Web sida: "
     IDS_WELCOME_URL "http://www.reactos.org"
     IDS_WELCOME_TITLE "Välkommen till ReactOS programhanterare!\n\n"
     IDS_WELCOME_TEXT "Välj en kategori till vänster, och sedan ett program för att installera eller avinstallera.\nReactOS Web sida: "
     IDS_WELCOME_URL "http://www.reactos.org"


@@ -207,9 +209,47 @@ BEGIN
     IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!"
     IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!"
     IDS_UNABLE_TO_REMOVE "Det gick ej att ta bort programmets data från registret!"
     IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!"
     IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!"
     IDS_UNABLE_TO_REMOVE "Det gick ej att ta bort programmets data från registret!"

+    IDS_UNABLE_TO_INSTALL "Unable to open installer!"

     IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed."
     IDS_INTEG_CHECK_TITLE "Verifying package integrity..."
     IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended."
     IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet."
     IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity."
     IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed."
     IDS_INTEG_CHECK_TITLE "Verifying package integrity..."
     IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended."
     IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet."
     IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity."

+    IDS_SELECT_ALL "Select/Deselect All"
+    IDS_INSTALL_SELECTED "Install Selected"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_STATUS_INSTALLED "Installed"
+    IDS_STATUS_NOTINSTALLED "Not installed"
+    IDS_STATUS_DOWNLOADED "Downloaded"
+    IDS_STATUS_UPDATE_AVAILABLE "Update available"
+    IDS_STATUS_DOWNLOADING "Downloading…"
+    IDS_STATUS_INSTALLING "Installing…"
+    IDS_STATUS_WAITING "Waiting to install…"
+    IDS_STATUS_FINISHED "Finished"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_LICENSE_OPENSOURCE "Open Source"
+    IDS_LICENSE_FREEWARE "Freeware"
+    IDS_LICENSE_TRIAL "Trial/Demo"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_LANGUAGE_AVAILABLE_TRANSLATION "Supports your language"
+    IDS_LANGUAGE_NO_TRANSLATION "Supports other languages"
+    IDS_LANGUAGE_ENGLISH_TRANSLATION "Supports English"
+    IDS_LANGUAGE_SINGLE "Single language"
+    IDS_LANGUAGE_MORE_PLACEHOLDER " (+%d more)"
+    IDS_LANGUAGE_AVAILABLE_PLACEHOLDER " (+%d available)"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_DL_DIALOG_DB_DISP "Applications Database"
+    IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Updating Database..."

 END
 END

diff --git a/reactos/base/applications/rapps/lang/tr-TR.rc b/reactos/base/applications/rapps/lang/tr-TR.rc
index ddb36c6..a50b1cf 100644 (file)
--- a/reactos/base/applications/rapps/lang/tr-TR.rc
+++ b/reactos/base/applications/rapps/lang/tr-TR.rc
@@ -94,7 +94,7 @@ END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE

-CAPTION "İndiriliyor"
+CAPTION "İndiriliyor %ls..."

 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12


@@ -154,11 +154,13 @@ END
 STRINGTABLE
 BEGIN
     IDS_AINFO_VERSION "\nSürümü: "
 STRINGTABLE
 BEGIN
     IDS_AINFO_VERSION "\nSürümü: "

+    IDS_AINFO_AVAILABLEVERSION "\nAvailable Version: "

     IDS_AINFO_DESCRIPTION "\nAçıklaması: "
     IDS_AINFO_SIZE "\nBüyüklüğü: "
     IDS_AINFO_URLSITE "\nAna Sayfası: "
     IDS_AINFO_LICENSE "\nRuhsatı: "
     IDS_AINFO_URLDOWNLOAD "\nİndir: "
     IDS_AINFO_DESCRIPTION "\nAçıklaması: "
     IDS_AINFO_SIZE "\nBüyüklüğü: "
     IDS_AINFO_URLSITE "\nAna Sayfası: "
     IDS_AINFO_LICENSE "\nRuhsatı: "
     IDS_AINFO_URLDOWNLOAD "\nİndir: "

+    IDS_AINFO_LANGUAGES "\nLanguages: "

 END
 
 STRINGTABLE
 END
 
 STRINGTABLE


@@ -187,7 +189,7 @@ BEGIN
     IDS_INSTALL "Kur"
     IDS_UNINSTALL "Kaldır"
     IDS_MODIFY "Değiştir"
     IDS_INSTALL "Kur"
     IDS_UNINSTALL "Kaldır"
     IDS_MODIFY "Değiştir"

-    IDS_APPS_COUNT "Uygulama Sayısı: %d"
+    IDS_APPS_COUNT "Uygulama Sayısı: %d; Selected: %d"

     IDS_WELCOME_TITLE "ReactOS Uygulama Yöneticisi'ne hoş geldiniz.\n\n"
     IDS_WELCOME_TEXT "Solda bir ulam seçiniz, ardından kurmak ya da kaldırmak için bir uygulama seçiniz.\nReactOS'un Umûmî Ağ sitesi: "
     IDS_WELCOME_URL "http://www.reactos.org"
     IDS_WELCOME_TITLE "ReactOS Uygulama Yöneticisi'ne hoş geldiniz.\n\n"
     IDS_WELCOME_TEXT "Solda bir ulam seçiniz, ardından kurmak ya da kaldırmak için bir uygulama seçiniz.\nReactOS'un Umûmî Ağ sitesi: "
     IDS_WELCOME_URL "http://www.reactos.org"


@@ -202,9 +204,47 @@ BEGIN
     IDS_UNABLE_TO_DOWNLOAD "Paket indirilemez! Adres bulunamadı!"
     IDS_UNABLE_TO_DOWNLOAD2 "Paket indirilemez! Umûmî Ağ bağlantınızı yoklayınız!"
     IDS_UNABLE_TO_REMOVE "İzlencenin girişi değer defterinden silinemiyor."
     IDS_UNABLE_TO_DOWNLOAD "Paket indirilemez! Adres bulunamadı!"
     IDS_UNABLE_TO_DOWNLOAD2 "Paket indirilemez! Umûmî Ağ bağlantınızı yoklayınız!"
     IDS_UNABLE_TO_REMOVE "İzlencenin girişi değer defterinden silinemiyor."

+    IDS_UNABLE_TO_INSTALL "Unable to open installer!"

     IDS_CERT_DOES_NOT_MATCH "SSL onay belgesi doğrulaması başarısız."
     IDS_INTEG_CHECK_TITLE "Paket bütünlüğü doğrulanıyor..."
     IDS_INTEG_CHECK_FAIL "Paket bütünlük denetimini geçmedi, bozulmuş veyâ indirme esnâsında oynanmış olabilir. Yazılımı çalıştırmak önerilmez."
     IDS_INTERRUPTED_DOWNLOAD "İndirme kesildi. Umûmî Ağ bağlantınızı denetleyiniz."
     IDS_UNABLE_TO_WRITE "Diske yazılamıyor. Disk dolu olabilir."
     IDS_CERT_DOES_NOT_MATCH "SSL onay belgesi doğrulaması başarısız."
     IDS_INTEG_CHECK_TITLE "Paket bütünlüğü doğrulanıyor..."
     IDS_INTEG_CHECK_FAIL "Paket bütünlük denetimini geçmedi, bozulmuş veyâ indirme esnâsında oynanmış olabilir. Yazılımı çalıştırmak önerilmez."
     IDS_INTERRUPTED_DOWNLOAD "İndirme kesildi. Umûmî Ağ bağlantınızı denetleyiniz."
     IDS_UNABLE_TO_WRITE "Diske yazılamıyor. Disk dolu olabilir."

+    IDS_SELECT_ALL "Select/Deselect All"
+    IDS_INSTALL_SELECTED "Install Selected"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_STATUS_INSTALLED "Installed"
+    IDS_STATUS_NOTINSTALLED "Not installed"
+    IDS_STATUS_DOWNLOADED "Downloaded"
+    IDS_STATUS_UPDATE_AVAILABLE "Update available"
+    IDS_STATUS_DOWNLOADING "Downloading…"
+    IDS_STATUS_INSTALLING "Installing…"
+    IDS_STATUS_WAITING "Waiting to install…"
+    IDS_STATUS_FINISHED "Finished"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_LICENSE_OPENSOURCE "Open Source"
+    IDS_LICENSE_FREEWARE "Freeware"
+    IDS_LICENSE_TRIAL "Trial/Demo"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_LANGUAGE_AVAILABLE_TRANSLATION "Supports your language"
+    IDS_LANGUAGE_NO_TRANSLATION "Supports other languages"
+    IDS_LANGUAGE_ENGLISH_TRANSLATION "Supports English"
+    IDS_LANGUAGE_SINGLE "Single language"
+    IDS_LANGUAGE_MORE_PLACEHOLDER " (+%d more)"
+    IDS_LANGUAGE_AVAILABLE_PLACEHOLDER " (+%d available)"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_DL_DIALOG_DB_DISP "Applications Database"
+    IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Updating Database..."

 END
 END

diff --git a/reactos/base/applications/rapps/lang/uk-UA.rc b/reactos/base/applications/rapps/lang/uk-UA.rc
index 258367d..c9320c4 100644 (file)
--- a/reactos/base/applications/rapps/lang/uk-UA.rc
+++ b/reactos/base/applications/rapps/lang/uk-UA.rc
@@ -166,6 +166,7 @@ BEGIN
     IDS_AINFO_URLSITE "\nДомашня сторінка: "
     IDS_AINFO_LICENSE "\nЛіцензія: "
     IDS_AINFO_URLDOWNLOAD "\nЗавантажити: "
     IDS_AINFO_URLSITE "\nДомашня сторінка: "
     IDS_AINFO_LICENSE "\nЛіцензія: "
     IDS_AINFO_URLDOWNLOAD "\nЗавантажити: "

+    IDS_AINFO_LANGUAGES "\nМови: "

 END
 
 STRINGTABLE
 END
 
 STRINGTABLE


@@ -208,13 +209,15 @@ BEGIN
     IDS_INFORMATION "Інформація"
     IDS_UNABLE_TO_DOWNLOAD "Неможливо завантажити додаток! Адресу не знайдено!"
     IDS_UNABLE_TO_DOWNLOAD2 "Неможливо завантажити додаток! Перевірте підключення до мережі Інтернет!"
     IDS_INFORMATION "Інформація"
     IDS_UNABLE_TO_DOWNLOAD "Неможливо завантажити додаток! Адресу не знайдено!"
     IDS_UNABLE_TO_DOWNLOAD2 "Неможливо завантажити додаток! Перевірте підключення до мережі Інтернет!"

-    IDS_UNABLE_TO_INSTALL "Unable to open installer!"

     IDS_UNABLE_TO_REMOVE "Не вдалося видалити дані про програму з реєстру!"
     IDS_UNABLE_TO_REMOVE "Не вдалося видалити дані про програму з реєстру!"

+    IDS_UNABLE_TO_INSTALL "Не вдалося завершити інсталювання!"

     IDS_CERT_DOES_NOT_MATCH "Помилка перевіки сертифікату SSL."
     IDS_INTEG_CHECK_TITLE "Перевірка цілістності додатку..."
     IDS_INTEG_CHECK_FAIL "Додаток не пройшов перевірку цілістності, його молги пошкодити чи замінити. Запуск додатку не рекомендується."
     IDS_INTERRUPTED_DOWNLOAD "Завантаження перервано. Перевірте підключення до мережі Інтернет."
     IDS_UNABLE_TO_WRITE "Записк на диск неможливий. Можливо, на диску недостатньо містця."
     IDS_CERT_DOES_NOT_MATCH "Помилка перевіки сертифікату SSL."
     IDS_INTEG_CHECK_TITLE "Перевірка цілістності додатку..."
     IDS_INTEG_CHECK_FAIL "Додаток не пройшов перевірку цілістності, його молги пошкодити чи замінити. Запуск додатку не рекомендується."
     IDS_INTERRUPTED_DOWNLOAD "Завантаження перервано. Перевірте підключення до мережі Інтернет."
     IDS_UNABLE_TO_WRITE "Записк на диск неможливий. Можливо, на диску недостатньо містця."

+    IDS_SELECT_ALL "Вибрати все"
+    IDS_INSTALL_SELECTED "Встановити обране"

 END
 
 STRINGTABLE
 END
 
 STRINGTABLE


@@ -225,8 +228,8 @@ BEGIN
     IDS_STATUS_UPDATE_AVAILABLE "Є оновлення"
     IDS_STATUS_DOWNLOADING "Завантажується…"
     IDS_STATUS_INSTALLING "Встановлюється…"
     IDS_STATUS_UPDATE_AVAILABLE "Є оновлення"
     IDS_STATUS_DOWNLOADING "Завантажується…"
     IDS_STATUS_INSTALLING "Встановлюється…"

-    IDS_STATUS_WAITING "Очікування завантаження…"
-    IDS_STATUS_FINISHED "Завершено"  
+    IDS_STATUS_WAITING "Очікування завантаження..."
+    IDS_STATUS_FINISHED "Завершено"

 END
 
 STRINGTABLE
 END
 
 STRINGTABLE


@@ -242,4 +245,12 @@ BEGIN
     IDS_LANGUAGE_NO_TRANSLATION "Доступно іншими мовами"
     IDS_LANGUAGE_ENGLISH_TRANSLATION "Є переклад Англійською"
     IDS_LANGUAGE_SINGLE "Одна мова"
     IDS_LANGUAGE_NO_TRANSLATION "Доступно іншими мовами"
     IDS_LANGUAGE_ENGLISH_TRANSLATION "Є переклад Англійською"
     IDS_LANGUAGE_SINGLE "Одна мова"

-END
\ No newline at end of file
+    IDS_LANGUAGE_MORE_PLACEHOLDER " (+ще %d)"
+    IDS_LANGUAGE_AVAILABLE_PLACEHOLDER " (+%d доступно)"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_DL_DIALOG_DB_DISP "Список програм"
+    IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Оновлення списку програм..."
+END

diff --git a/reactos/base/applications/rapps/lang/zh-CN.rc b/reactos/base/applications/rapps/lang/zh-CN.rc
index 557fa0b..620e9a1 100644 (file)
--- a/reactos/base/applications/rapps/lang/zh-CN.rc
+++ b/reactos/base/applications/rapps/lang/zh-CN.rc
@@ -94,7 +94,7 @@ END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE

-CAPTION "正在下载..."
+CAPTION "正在下载 %ls..."

 FONT 9, "MS Shell Dlg"
 BEGIN
     CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12
 FONT 9, "MS Shell Dlg"
 BEGIN
     CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12


@@ -154,11 +154,13 @@ END
 STRINGTABLE
 BEGIN
     IDS_AINFO_VERSION "\n版本："
 STRINGTABLE
 BEGIN
     IDS_AINFO_VERSION "\n版本："

+    IDS_AINFO_AVAILABLEVERSION "\nAvailable Version: "

     IDS_AINFO_DESCRIPTION "\n描述："
     IDS_AINFO_SIZE "\n大小："
     IDS_AINFO_URLSITE "\n主页："
     IDS_AINFO_LICENSE "\n协议："
     IDS_AINFO_URLDOWNLOAD "\n下载:"
     IDS_AINFO_DESCRIPTION "\n描述："
     IDS_AINFO_SIZE "\n大小："
     IDS_AINFO_URLSITE "\n主页："
     IDS_AINFO_LICENSE "\n协议："
     IDS_AINFO_URLDOWNLOAD "\n下载:"

+    IDS_AINFO_LANGUAGES "\nLanguages: "

 END
 
 STRINGTABLE
 END
 
 STRINGTABLE


@@ -187,7 +189,7 @@ BEGIN
     IDS_INSTALL "安装"
     IDS_UNINSTALL "卸载"
     IDS_MODIFY "修改"
     IDS_INSTALL "安装"
     IDS_UNINSTALL "卸载"
     IDS_MODIFY "修改"

-    IDS_APPS_COUNT "程序个数：%d"
+    IDS_APPS_COUNT "程序个数：%d; Selected: %d"

     IDS_WELCOME_TITLE "欢迎来到 ReactOS 程序管理器！\n\n"
     IDS_WELCOME_TEXT "从左栏选择一个类别，然后选择要安装或卸载的程序。\nReactOS 网站："
     IDS_WELCOME_URL "http://www.reactos.org"
     IDS_WELCOME_TITLE "欢迎来到 ReactOS 程序管理器！\n\n"
     IDS_WELCOME_TEXT "从左栏选择一个类别，然后选择要安装或卸载的程序。\nReactOS 网站："
     IDS_WELCOME_URL "http://www.reactos.org"


@@ -202,9 +204,47 @@ BEGIN
     IDS_UNABLE_TO_DOWNLOAD "无法下载该软件包 ！找不到网络的地址 ！"
     IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!"
     IDS_UNABLE_TO_REMOVE "无法从注册表删除该程序的数据！"
     IDS_UNABLE_TO_DOWNLOAD "无法下载该软件包 ！找不到网络的地址 ！"
     IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!"
     IDS_UNABLE_TO_REMOVE "无法从注册表删除该程序的数据！"

+    IDS_UNABLE_TO_INSTALL "Unable to open installer!"

     IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed."
     IDS_INTEG_CHECK_TITLE "Verifying package integrity..."
     IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended."
     IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet."
     IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity."
     IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed."
     IDS_INTEG_CHECK_TITLE "Verifying package integrity..."
     IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended."
     IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet."
     IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity."

+    IDS_SELECT_ALL "Select/Deselect All"
+    IDS_INSTALL_SELECTED "Install Selected"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_STATUS_INSTALLED "Installed"
+    IDS_STATUS_NOTINSTALLED "Not installed"
+    IDS_STATUS_DOWNLOADED "Downloaded"
+    IDS_STATUS_UPDATE_AVAILABLE "Update available"
+    IDS_STATUS_DOWNLOADING "Downloading…"
+    IDS_STATUS_INSTALLING "Installing…"
+    IDS_STATUS_WAITING "Waiting to install…"
+    IDS_STATUS_FINISHED "Finished"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_LICENSE_OPENSOURCE "Open Source"
+    IDS_LICENSE_FREEWARE "Freeware"
+    IDS_LICENSE_TRIAL "Trial/Demo"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_LANGUAGE_AVAILABLE_TRANSLATION "Supports your language"
+    IDS_LANGUAGE_NO_TRANSLATION "Supports other languages"
+    IDS_LANGUAGE_ENGLISH_TRANSLATION "Supports English"
+    IDS_LANGUAGE_SINGLE "Single language"
+    IDS_LANGUAGE_MORE_PLACEHOLDER " (+%d more)"
+    IDS_LANGUAGE_AVAILABLE_PLACEHOLDER " (+%d available)"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_DL_DIALOG_DB_DISP "Applications Database"
+    IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Updating Database..."

 END
 END

diff --git a/reactos/base/applications/rapps/lang/zh-TW.rc b/reactos/base/applications/rapps/lang/zh-TW.rc
index 896b387..9cf91af 100644 (file)
--- a/reactos/base/applications/rapps/lang/zh-TW.rc
+++ b/reactos/base/applications/rapps/lang/zh-TW.rc
@@ -94,7 +94,7 @@ END
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE
 
 IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72
 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE

-CAPTION "正在下載..."
+CAPTION "正在下載 %ls..."

 FONT 9, "MS Shell Dlg"
 BEGIN
     CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12
 FONT 9, "MS Shell Dlg"
 BEGIN
     CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12


@@ -154,11 +154,13 @@ END
 STRINGTABLE
 BEGIN
     IDS_AINFO_VERSION "\n版本："
 STRINGTABLE
 BEGIN
     IDS_AINFO_VERSION "\n版本："

+    IDS_AINFO_AVAILABLEVERSION "\nAvailable Version: "

     IDS_AINFO_DESCRIPTION "\n描述："
     IDS_AINFO_SIZE "\n大小："
     IDS_AINFO_URLSITE "\n主頁："
     IDS_AINFO_LICENSE "\n協議："
     IDS_AINFO_URLDOWNLOAD "\n下載:"
     IDS_AINFO_DESCRIPTION "\n描述："
     IDS_AINFO_SIZE "\n大小："
     IDS_AINFO_URLSITE "\n主頁："
     IDS_AINFO_LICENSE "\n協議："
     IDS_AINFO_URLDOWNLOAD "\n下載:"

+    IDS_AINFO_LANGUAGES "\nLanguages: "

 END
 
 STRINGTABLE
 END
 
 STRINGTABLE


@@ -187,7 +189,7 @@ BEGIN
     IDS_INSTALL "安裝"
     IDS_UNINSTALL "解除安裝"
     IDS_MODIFY "修改"
     IDS_INSTALL "安裝"
     IDS_UNINSTALL "解除安裝"
     IDS_MODIFY "修改"

-    IDS_APPS_COUNT "程式個數：%d"
+    IDS_APPS_COUNT "程式個數：%d; Selected: %d"

     IDS_WELCOME_TITLE "歡迎來到 ReactOS 程式管理器！\n\n"
     IDS_WELCOME_TEXT "從左欄選擇一個類別，然後選擇要安裝或解除安裝的程式。\nReactOS 網站："
     IDS_WELCOME_URL "http://www.reactos.org"
     IDS_WELCOME_TITLE "歡迎來到 ReactOS 程式管理器！\n\n"
     IDS_WELCOME_TEXT "從左欄選擇一個類別，然後選擇要安裝或解除安裝的程式。\nReactOS 網站："
     IDS_WELCOME_URL "http://www.reactos.org"


@@ -202,9 +204,47 @@ BEGIN
     IDS_UNABLE_TO_DOWNLOAD "無法下載包!找不到的位址!"
     IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!"
     IDS_UNABLE_TO_REMOVE "無法從登錄檔刪除該程式的資料！"
     IDS_UNABLE_TO_DOWNLOAD "無法下載包!找不到的位址!"
     IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!"
     IDS_UNABLE_TO_REMOVE "無法從登錄檔刪除該程式的資料！"

+    IDS_UNABLE_TO_INSTALL "Unable to open installer!"

     IDS_CERT_DOES_NOT_MATCH "SSL 憑證驗證失敗。"
     IDS_INTEG_CHECK_TITLE "驗證套裝軟體的完整性..."
     IDS_INTEG_CHECK_FAIL "包沒有通過完整性檢查，它可能已損壞，或者在下載過程中篡改。建議您不要運行該軟體。"
     IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet."
     IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity."
     IDS_CERT_DOES_NOT_MATCH "SSL 憑證驗證失敗。"
     IDS_INTEG_CHECK_TITLE "驗證套裝軟體的完整性..."
     IDS_INTEG_CHECK_FAIL "包沒有通過完整性檢查，它可能已損壞，或者在下載過程中篡改。建議您不要運行該軟體。"
     IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet."
     IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity."

+    IDS_SELECT_ALL "Select/Deselect All"
+    IDS_INSTALL_SELECTED "Install Selected"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_STATUS_INSTALLED "Installed"
+    IDS_STATUS_NOTINSTALLED "Not installed"
+    IDS_STATUS_DOWNLOADED "Downloaded"
+    IDS_STATUS_UPDATE_AVAILABLE "Update available"
+    IDS_STATUS_DOWNLOADING "Downloading…"
+    IDS_STATUS_INSTALLING "Installing…"
+    IDS_STATUS_WAITING "Waiting to install…"
+    IDS_STATUS_FINISHED "Finished"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_LICENSE_OPENSOURCE "Open Source"
+    IDS_LICENSE_FREEWARE "Freeware"
+    IDS_LICENSE_TRIAL "Trial/Demo"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_LANGUAGE_AVAILABLE_TRANSLATION "Supports your language"
+    IDS_LANGUAGE_NO_TRANSLATION "Supports other languages"
+    IDS_LANGUAGE_ENGLISH_TRANSLATION "Supports English"
+    IDS_LANGUAGE_SINGLE "Single language"
+    IDS_LANGUAGE_MORE_PLACEHOLDER " (+%d more)"
+    IDS_LANGUAGE_AVAILABLE_PLACEHOLDER " (+%d available)"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_DL_DIALOG_DB_DISP "Applications Database"
+    IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Updating Database..."

 END
 END

diff --git a/reactos/base/applications/rapps/loaddlg.cpp b/reactos/base/applications/rapps/loaddlg.cpp
index 69ee830..0d77959 100644 (file)
--- a/reactos/base/applications/rapps/loaddlg.cpp
+++ b/reactos/base/applications/rapps/loaddlg.cpp
@@ -340,7 +340,7 @@ static BOOL CertIsValid(HINTERNET hInternet, LPWSTR lpszHostName)
 inline VOID MessageBox_LoadString(HWND hMainWnd, INT StringID)
 {
     ATL::CString szMsgText;
 inline VOID MessageBox_LoadString(HWND hMainWnd, INT StringID)
 {
     ATL::CString szMsgText;

-    if (szMsgText.LoadStringW(hInst, StringID))
+    if (szMsgText.LoadStringW(StringID))

     {
         MessageBoxW(hMainWnd, szMsgText.GetString(), NULL, MB_OK | MB_ICONERROR);
     }
     {
         MessageBoxW(hMainWnd, szMsgText.GetString(), NULL, MB_OK | MB_ICONERROR);
     }


@@ -548,6 +548,7 @@ DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param)
     const INT iAppId = iCurrentApp;
     const ATL::CSimpleArray<PAPPLICATION_INFO> InfoArray = static_cast<DownloadParam*>(param)->AppInfo;
     LPCWSTR szCaption = static_cast<DownloadParam*>(param)->szCaption;
     const INT iAppId = iCurrentApp;
     const ATL::CSimpleArray<PAPPLICATION_INFO> InfoArray = static_cast<DownloadParam*>(param)->AppInfo;
     LPCWSTR szCaption = static_cast<DownloadParam*>(param)->szCaption;

+    ATL::CStringW szNewCaption;

 
     delete param;
     if (InfoArray.GetSize() <= 0)
 
     delete param;
     if (InfoArray.GetSize() <= 0)


@@ -621,16 +622,15 @@ DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param)
         // Change caption to show the currently downloaded app
         if (!bCab)
         {
         // Change caption to show the currently downloaded app
         if (!bCab)
         {

-            ATL::CStringW szNewCaption = "";

             szNewCaption.Format(szCaption, pCurrentInfo->szName.GetString());
             szNewCaption.Format(szCaption, pCurrentInfo->szName.GetString());

-            SetWindowTextW(hDlg, szNewCaption.GetString());

         }
         else
         {
         }
         else
         {

-            //TODO: add this string to .rc
-            SetWindowTextW(hDlg, L"Downloading Database...");
+            szNewCaption.LoadStringW(IDS_DL_DIALOG_DB_DOWNLOAD_DISP);

         }
 
         }
 

+        SetWindowTextW(hDlg, szNewCaption.GetString());
+

         // Add the download URL
         SetDlgItemTextW(hDlg, IDC_DOWNLOAD_STATUS, pCurrentInfo->szUrlDownload.GetString());
 
         // Add the download URL
         SetDlgItemTextW(hDlg, IDC_DOWNLOAD_STATUS, pCurrentInfo->szUrlDownload.GetString());
 


@@ -751,7 +751,7 @@ DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param)
             ATL::CStringW szMsgText;
 
             // change a few strings in the download dialog to reflect the verification process
             ATL::CStringW szMsgText;
 
             // change a few strings in the download dialog to reflect the verification process

-            if (!szMsgText.LoadStringW(hInst, IDS_INTEG_CHECK_TITLE))
+            if (!szMsgText.LoadStringW(IDS_INTEG_CHECK_TITLE))

                 goto end;
 
             SetWindowTextW(hDlg, szMsgText.GetString());
                 goto end;
 
             SetWindowTextW(hDlg, szMsgText.GetString());


@@ -760,7 +760,7 @@ DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param)
             // this may take a while, depending on the file size
             if (!VerifyInteg(pCurrentInfo->szSHA1, Path.GetString()))
             {
             // this may take a while, depending on the file size
             if (!VerifyInteg(pCurrentInfo->szSHA1, Path.GetString()))
             {

-                if (!szMsgText.LoadStringW(hInst, IDS_INTEG_CHECK_FAIL))
+                if (!szMsgText.LoadStringW(IDS_INTEG_CHECK_FAIL))

                     goto end;
 
                 MessageBoxW(hDlg, szMsgText.GetString(), NULL, MB_OK | MB_ICONERROR);
                     goto end;
 
                 MessageBoxW(hDlg, szMsgText.GetString(), NULL, MB_OK | MB_ICONERROR);


@@ -815,7 +815,7 @@ end:
     return 0;
 }
 
     return 0;
 }
 

-BOOL CDownloadManager::DownloadListOfApplications(const ATL::CSimpleArray<PAPPLICATION_INFO>& AppsList, BOOL modal)
+BOOL CDownloadManager::DownloadListOfApplications(const ATL::CSimpleArray<PAPPLICATION_INFO>& AppsList, BOOL bIsModal)

 {
     if (AppsList.GetSize() == 0)
     {
 {
     if (AppsList.GetSize() == 0)
     {


@@ -826,12 +826,12 @@ BOOL CDownloadManager::DownloadListOfApplications(const ATL::CSimpleArray<PAPPLI
     AppsToInstallList = AppsList;
 
     // Create a dialog and issue a download process
     AppsToInstallList = AppsList;
 
     // Create a dialog and issue a download process

-    LaunchDownloadDialog(modal);
+    LaunchDownloadDialog(bIsModal);

 
     return TRUE;
 }
 
 
     return TRUE;
 }
 

-BOOL CDownloadManager::DownloadApplication(PAPPLICATION_INFO pAppInfo, BOOL modal)
+BOOL CDownloadManager::DownloadApplication(PAPPLICATION_INFO pAppInfo, BOOL bIsModal)

 {
     if (!pAppInfo)
     {
 {
     if (!pAppInfo)
     {


@@ -840,7 +840,7 @@ BOOL CDownloadManager::DownloadApplication(PAPPLICATION_INFO pAppInfo, BOOL moda
 
     AppsToInstallList.RemoveAll();
     AppsToInstallList.Add(pAppInfo);
 
     AppsToInstallList.RemoveAll();
     AppsToInstallList.Add(pAppInfo);

-    LaunchDownloadDialog(modal);
+    LaunchDownloadDialog(bIsModal);

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -849,15 +849,14 @@ VOID CDownloadManager::DownloadApplicationsDB(LPCWSTR lpUrl)
 {
     static APPLICATION_INFO IntInfo;
     IntInfo.szUrlDownload = lpUrl;
 {
     static APPLICATION_INFO IntInfo;
     IntInfo.szUrlDownload = lpUrl;

-    //TODO: add this string to .rc
-    IntInfo.szName = L"RAPPS DB";
+    IntInfo.szName.LoadStringW(IDS_DL_DIALOG_DB_DISP);

     DownloadApplication(&IntInfo, TRUE);
 }
 
 //TODO: Reuse the dialog
     DownloadApplication(&IntInfo, TRUE);
 }
 
 //TODO: Reuse the dialog

-VOID CDownloadManager::LaunchDownloadDialog(BOOL modal)
+VOID CDownloadManager::LaunchDownloadDialog(BOOL bIsModal)

 {
 {

-    if (modal)
+    if (bIsModal)

     {
         DialogBoxW(hInst,
                    MAKEINTRESOURCEW(IDD_DOWNLOAD_DIALOG),
     {
         DialogBoxW(hInst,
                    MAKEINTRESOURCEW(IDD_DOWNLOAD_DIALOG),

diff --git a/reactos/base/applications/rapps/misc.cpp b/reactos/base/applications/rapps/misc.cpp
index 3e6e389..927b400 100644 (file)
--- a/reactos/base/applications/rapps/misc.cpp
+++ b/reactos/base/applications/rapps/misc.cpp
@@ -110,13 +110,13 @@ VOID SetWelcomeText()
 {
     ATL::CStringW szText;
 
 {
     ATL::CStringW szText;
 

-    szText.LoadStringW(hInst, IDS_WELCOME_TITLE);
+    szText.LoadStringW(IDS_WELCOME_TITLE);

     NewRichEditText(szText, CFE_BOLD);
 
     NewRichEditText(szText, CFE_BOLD);
 

-    szText.LoadStringW(hInst, IDS_WELCOME_TEXT);
+    szText.LoadStringW(IDS_WELCOME_TEXT);

     InsertRichEditText(szText, 0);
 
     InsertRichEditText(szText, 0);
 

-    szText.LoadStringW(hInst, IDS_WELCOME_URL);
+    szText.LoadStringW(IDS_WELCOME_URL);

     InsertRichEditText(szText, CFM_LINK);
 }
 
     InsertRichEditText(szText, CFM_LINK);
 }
 

diff --git a/reactos/base/applications/rapps/settingsdlg.cpp b/reactos/base/applications/rapps/settingsdlg.cpp
index 46dcf55..306cbaf 100644 (file)
--- a/reactos/base/applications/rapps/settingsdlg.cpp
+++ b/reactos/base/applications/rapps/settingsdlg.cpp
@@ -22,7 +22,7 @@ ChooseFolder(HWND hwnd)
     BROWSEINFOW bi;
     ATL::CStringW szBuf;
 
     BROWSEINFOW bi;
     ATL::CStringW szBuf;
 

-    szBuf.LoadStringW(hInst, IDS_CHOOSE_FOLDER_TEXT);
+    szBuf.LoadStringW(IDS_CHOOSE_FOLDER_TEXT);

 
     ZeroMemory(&bi, sizeof(bi));
     bi.hwndOwner = hwnd;
 
     ZeroMemory(&bi, sizeof(bi));
     bi.hwndOwner = hwnd;


@@ -172,7 +172,7 @@ static INT_PTR CALLBACK SettingsDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPAR
             else
             {
                 ATL::CStringW szMsgText;
             else
             {
                 ATL::CStringW szMsgText;

-                szMsgText.LoadStringW(hInst, IDS_CHOOSE_FOLDER_ERROR);
+                szMsgText.LoadStringW(IDS_CHOOSE_FOLDER_ERROR);

 
                 if (MessageBoxW(hDlg, szMsgText.GetString(), NULL, MB_YESNO) == IDYES)
                 {
 
                 if (MessageBoxW(hDlg, szMsgText.GetString(), NULL, MB_YESNO) == IDYES)
                 {

diff --git a/reactos/base/applications/rapps/winmain.cpp b/reactos/base/applications/rapps/winmain.cpp
index 1e61c56..bb10bc4 100644 (file)
--- a/reactos/base/applications/rapps/winmain.cpp
+++ b/reactos/base/applications/rapps/winmain.cpp
@@ -128,7 +128,7 @@ INT WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi
     HANDLE hMutex;
     HACCEL KeyBrd;
     MSG Msg;
     HANDLE hMutex;
     HACCEL KeyBrd;
     MSG Msg;

-    BOOL bFirstLaunch;
+    BOOL bIsFirstLaunch;

 
     InitializeAtlModule(hInstance, TRUE);
 
 
     InitializeAtlModule(hInstance, TRUE);
 


@@ -150,8 +150,8 @@ INT WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi
         SetForegroundWindow(hWindow);
         return 1;
     }
         SetForegroundWindow(hWindow);
         return 1;
     }

-    bFirstLaunch = LoadSettings();
-    if (bFirstLaunch)
+    bIsFirstLaunch = !LoadSettings();
+    if (bIsFirstLaunch)

     {
         FillDefaultSettings(&SettingsInfo);
     }
     {
         FillDefaultSettings(&SettingsInfo);
     }


@@ -162,7 +162,7 @@ INT WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi
     // skip window creation if there were some keys
     if (!CmdParser(lpCmdLine))
     {
     // skip window creation if there were some keys
     if (!CmdParser(lpCmdLine))
     {

-        if (SettingsInfo.bUpdateAtStart || bFirstLaunch)
+        if (SettingsInfo.bUpdateAtStart || bIsFirstLaunch)

             CAvailableApps::ForceUpdateAppsDB();
 
         hMainWnd = CreateMainWindow();
             CAvailableApps::ForceUpdateAppsDB();
 
         hMainWnd = CreateMainWindow();