Changeset 91718 in vbox for trunk/src/VBox/Main/include

Timestamp:

Oct 14, 2021 11:43:12 AM (3 years ago)

Author:

vboxsync

Message:

Main: bugref:1909: Added initial translation to Russian of API messages. Fixed errors and plurals wherever needed. Fixed type of the plural argument in the tr()

Location:

trunk/src/VBox/Main/include

Files:

• QMTranslator.h (modified) (1 diff)
• VBoxNls.h (modified) (2 diffs)
• VirtualBoxBase.h (modified) (2 diffs)
• VirtualBoxTranslator.h (modified) (2 diffs)

trunk/src/VBox/Main/include/QMTranslator.h

@@ -44 +44 @@
      */
     const char *translate(const char *pszContext, const char *pszSource, const char **ppszSafeSource,
-                          const char *pszDisamb = NULL, const int iNum = -1) const RT_NOEXCEPT;
+                          const char *pszDisamb = NULL, const size_t aNum = (~(size_t)0)) const RT_NOEXCEPT;
 
     /**

trunk/src/VBox/Main/include/VBoxNls.h

@@ -34 +34 @@
 struct ctx \
 {\
-   static const char *tr(const char *pszSource, const char *pszComment = NULL, const int iNum = -1) \
+   static const char *tr(const char *pszSource, const char *pszComment = NULL, const size_t aNum = (~(size_t)0)) \
    { \
-       return VirtualBoxTranslator::translate(NULL, #ctx, pszSource, pszComment, iNum); \
+       return VirtualBoxTranslator::translate(NULL, #ctx, pszSource, pszComment, aNum); \
    } \
 }
@@ -43 +43 @@
 struct ctx \
 {\
-   static const char *tr(const char *pszSource, const char *pszComment = NULL, const int iNum = -1) \
+   static const char *tr(const char *pszSource, const char *pszComment = NULL, const size_t aNum = (~(size_t)0)) \
    { \
        NOREF(pszComment); \
-       NOREF(iNum);       \
+       NOREF(aNum);       \
        return pszSource;  \
    } \

trunk/src/VBox/Main/include/VirtualBoxBase.h

@@ -577 +577 @@
 #ifdef VBOX_WITH_MAIN_NLS
 # define DECLARE_TRANSLATE_METHODS(cls) \
-    static inline const char *tr(const char *aSourceText, \
-                                 const char *aComment = NULL, \
-                                 const int   aNum = -1) \
+    static inline const char *tr(const char  *aSourceText, \
+                                 const char  *aComment = NULL, \
+                                 const size_t aNum = (~(size_t)0)) \
     { \
         return VirtualBoxTranslator::translate(NULL, #cls, aSourceText, aComment, aNum); \
@@ -587 +587 @@
     static inline const char *tr(const char *aSourceText, \
                                  const char *aComment = NULL, \
-                                 const int   aNum = -1) \
+                                 const size_t aNum = (~(size_t)0)) \
     { \
         RT_NOREF(aComment, aNum); \

trunk/src/VBox/Main/include/VirtualBoxTranslator.h

@@ -92 +92 @@
      */
     static const char *translate(PTRCOMPONENT aComponent,
-                                 const char *aContext,
-                                 const char *aSourceText,
-                                 const char *aComment = NULL,
-                                 const int   aNum = -1) RT_NOEXCEPT;
+                                 const char  *aContext,
+                                 const char  *aSourceText,
+                                 const char  *aComment = NULL,
+                                 const size_t aNum = (~(size_t)0)) RT_NOEXCEPT;
 
     /**
@@ -141 +141 @@
 
     const char *i_translate(PTRCOMPONENT aComponent,
-                            const char *aContext,
-                            const char *aSourceText,
-                            const char *aComment = NULL,
-                            const int   aNum = -1) RT_NOEXCEPT;
+                            const char   *aContext,
+                            const char   *aSourceText,
+                            const char   *aComment = NULL,
+                            const size_t aNum = (~(size_t)0)) RT_NOEXCEPT;
 };