Ros-diffs September 2023

ros-diffs@reactos.org

23 participants
113 discussions

[reactos] 01/01: [MSGINA] Update Romanian (ro-RO) translation (#5636)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f86fdfb526acb4fe86783… commit f86fdfb526acb4fe867837399556a0859c6ca915 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sat Sep 2 16:43:38 2023 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 2 15:43:38 2023 +0200 [MSGINA] Update Romanian (ro-RO) translation (#5636) --- dll/win32/msgina/lang/ro-RO.rc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dll/win32/msgina/lang/ro-RO.rc b/dll/win32/msgina/lang/ro-RO.rc index cfbc268afd6..c5b896fa831 100644 --- a/dll/win32/msgina/lang/ro-RO.rc +++ b/dll/win32/msgina/lang/ro-RO.rc @@ -4,7 +4,7 @@ * PURPOSE: Romanian resource file * TRANSLATORS: Copyright 2009 Petru Dimitriu <petrimetri(a)gmail.com> * Copyright 2011-2019 Ștefan Fulea <stefan.fulea(a)mail.com> - * Copyright 2022 Andrei Miloiu <miloiuandrei(a)gmail.com> + * Copyright 2022-2023 Andrei Miloiu <miloiuandrei(a)gmail.com> */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -243,10 +243,10 @@ BEGIN IDS_INVALIDLOGONHOURS "Contul dumneavoastră are restricții de timp care vă împiedică să vă conectați în acest moment. Încercați mai târziu." IDS_INVALIDWORKSTATION "Contul dumneavoastră este configurat pentru a vă preveni în a folosi acest calculator. Încercați la alt calculator." IDS_ACCOUNTRESTRICTION "Eșec în conectarea dumneavoastră din cauza unei restricții a contului." - IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" - IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." - IDS_EMERGENCYRESTARTTITLE "Emergency restart" - IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." + IDS_EMERGENCYLOGOFFTITLE "Deautentificare din ReactOS" + IDS_EMERGENCYLOGOFF "Apăsați Confirmă pentru a vă deautentifica imediat. Toate datele nepăstrate vor fi pierdute. Folosiți acest lucru doar ca ultimă soluție." + IDS_EMERGENCYRESTARTTITLE "Repornire de urgență" + IDS_EMERGENCYRESTART "Apăsați Confirmă pentru a vă reporni calculatorul imediat. Toate datele nepăstrate vor fi pierdute. Folosiți acest lucru doar ca ultimă soluție." END /* Shutdown Dialog Strings */

1 year, 3 months

[reactos] 01/01: [ATL] atlimage.h: Rename some members

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a93352fdafadad6a98ae9… commit a93352fdafadad6a98ae9f9d5c22817b034aabdc Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Sep 2 13:22:32 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Sep 2 13:22:32 2023 +0900 [ATL] atlimage.h: Rename some members Based on Doxygen analysis. - s/m_hbmOld/m_hOldBitmap/ - s/m_hbm/m_hBitmap/ - s/m_bHasAlphaCh/m_bHasAlphaChannel/ - s/m_bIsDIBSec/m_bIsDIBSection/ - s/m_rgbTransColor/m_clrTransparentColor/ CORE-19008 --- sdk/lib/atl/atlimage.h | 88 +++++++++++++++++++++++++------------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/sdk/lib/atl/atlimage.h b/sdk/lib/atl/atlimage.h index 6865b38e84d..31cceac8c76 100644 --- a/sdk/lib/atl/atlimage.h +++ b/sdk/lib/atl/atlimage.h @@ -45,14 +45,14 @@ public: CImage() throw() { - m_hbm = NULL; - m_hbmOld = NULL; + m_hBitmap = NULL; + m_hOldBitmap = NULL; m_hDC = NULL; m_eOrientation = DIBOR_DEFAULT; - m_bHasAlphaCh = false; - m_bIsDIBSec = false; - m_rgbTransColor = CLR_INVALID; + m_bHasAlphaChannel = false; + m_bIsDIBSection = false; + m_clrTransparentColor = CLR_INVALID; ZeroMemory(&m_ds, sizeof(m_ds)); s_gdiplus.IncreaseCImageCount(); @@ -66,7 +66,7 @@ public: operator HBITMAP() throw() { - return m_hbm; + return m_hBitmap; } static void ReleaseGDIPlus() @@ -82,12 +82,12 @@ public: HBITMAP Detach() throw() { m_eOrientation = DIBOR_DEFAULT; - m_bHasAlphaCh = false; - m_rgbTransColor = CLR_INVALID; + m_bHasAlphaChannel = false; + m_clrTransparentColor = CLR_INVALID; ZeroMemory(&m_ds, sizeof(m_ds)); - HBITMAP hBitmap = m_hbm; - m_hbm = NULL; + HBITMAP hBitmap = m_hBitmap; + m_hBitmap = NULL; return hBitmap; } @@ -97,7 +97,7 @@ public: return m_hDC; m_hDC = ::CreateCompatibleDC(NULL); - m_hbmOld = ::SelectObject(m_hDC, m_hbm); + m_hOldBitmap = (HBITMAP)::SelectObject(m_hDC, m_hBitmap); return m_hDC; } @@ -108,10 +108,10 @@ public: if (m_hDC == NULL) return; - if (m_hbmOld) + if (m_hOldBitmap) { - ::SelectObject(m_hDC, m_hbmOld); - m_hbmOld = NULL; + ::SelectObject(m_hDC, m_hOldBitmap); + m_hOldBitmap = NULL; } ::DeleteDC(m_hDC); m_hDC = NULL; @@ -204,7 +204,7 @@ public: void Destroy() throw() { - if (m_hbm) + if (m_hBitmap) { ::DeleteObject(Detach()); } @@ -214,18 +214,18 @@ public: int xSrc, int ySrc, int nSrcWidth, int nSrcHeight) const throw() { ATLASSERT(IsTransparencySupported()); - if (m_bHasAlphaCh) + if (m_bHasAlphaChannel) { return AlphaBlend(hDestDC, xDest, yDest, nDestWidth, nDestHeight, xSrc, ySrc, nSrcWidth, nSrcHeight); } - else if (m_rgbTransColor != CLR_INVALID) + else if (m_clrTransparentColor != CLR_INVALID) { COLORREF rgb; - if ((m_rgbTransColor & 0xFF000000) == 0x01000000) - rgb = RGBFromPaletteIndex(m_rgbTransColor & 0xFF); + if ((m_clrTransparentColor & 0xFF000000) == 0x01000000) + rgb = RGBFromPaletteIndex(m_clrTransparentColor & 0xFF); else - rgb = m_rgbTransColor; + rgb = m_clrTransparentColor; return TransparentBlt(hDestDC, xDest, yDest, nDestWidth, nDestHeight, xSrc, ySrc, nSrcWidth, nSrcHeight, rgb); } @@ -278,7 +278,7 @@ public: int GetBPP() const throw() { - ATLASSERT(m_hbm); + ATLASSERT(m_hBitmap); return m_bm.bmBitsPixel; } @@ -293,7 +293,7 @@ public: int GetHeight() const throw() { - ATLASSERT(m_hbm); + ATLASSERT(m_hBitmap); return m_bm.bmHeight; } @@ -345,19 +345,19 @@ public: COLORREF GetTransparentColor() const throw() { - return m_rgbTransColor; + return m_clrTransparentColor; } int GetWidth() const throw() { - ATLASSERT(m_hbm); + ATLASSERT(m_hBitmap); return m_bm.bmWidth; } bool IsDIBSection() const throw() { - ATLASSERT(m_hbm); - return m_bIsDIBSec; + ATLASSERT(m_hBitmap); + return m_bIsDIBSection; } bool IsIndexed() const throw() @@ -368,7 +368,7 @@ public: bool IsNull() const throw() { - return m_hbm == NULL; + return m_hBitmap == NULL; } HRESULT Load(LPCTSTR pszFileName) throw() @@ -511,7 +511,7 @@ public: return E_FAIL; using namespace Gdiplus; - ATLASSERT(m_hbm); + ATLASSERT(m_hBitmap); // Get encoders UINT cEncoders = 0; @@ -523,7 +523,7 @@ public: // create a GpBitmap from HBITMAP GpBitmap *pBitmap = NULL; - s_gdiplus.CreateBitmapFromHBITMAP(m_hbm, NULL, &pBitmap); + s_gdiplus.CreateBitmapFromHBITMAP(m_hBitmap, NULL, &pBitmap); // save to stream Status status; @@ -542,7 +542,7 @@ public: return E_FAIL; using namespace Gdiplus; - ATLASSERT(m_hbm); + ATLASSERT(m_hBitmap); // convert the file name string into Unicode CStringW pszNameW(pszFileName); @@ -566,7 +566,7 @@ public: // create a GpBitmap from HBITMAP GpBitmap *pBitmap = NULL; - s_gdiplus.CreateBitmapFromHBITMAP(m_hbm, NULL, &pBitmap); + s_gdiplus.CreateBitmapFromHBITMAP(m_hBitmap, NULL, &pBitmap); // save to file Status status = s_gdiplus.SaveImageToFile(pBitmap, pszNameW, &clsid, NULL); @@ -608,9 +608,9 @@ public: COLORREF SetTransparentColor(COLORREF rgbTransparent) throw() { - ATLASSERT(m_hbm); - COLORREF rgbOldColor = m_rgbTransColor; - m_rgbTransColor = rgbTransparent; + ATLASSERT(m_hBitmap); + COLORREF rgbOldColor = m_clrTransparentColor; + m_clrTransparentColor = rgbTransparent; return rgbOldColor; } @@ -1013,13 +1013,13 @@ private: } private: - HBITMAP m_hbm; - mutable HGDIOBJ m_hbmOld; + HBITMAP m_hBitmap; + mutable HBITMAP m_hOldBitmap; mutable HDC m_hDC; DIBOrientation m_eOrientation; - bool m_bHasAlphaCh; - bool m_bIsDIBSec; - COLORREF m_rgbTransColor; + bool m_bHasAlphaChannel; + bool m_bIsDIBSection; + COLORREF m_clrTransparentColor; union { BITMAP m_bm; @@ -1131,16 +1131,16 @@ private: Destroy(); const int size = sizeof(DIBSECTION); - m_bIsDIBSec = (::GetObject(hBitmap, size, &m_ds) == size); + m_bIsDIBSection = (::GetObject(hBitmap, size, &m_ds) == size); bool bOK = (::GetObject(hBitmap, sizeof(BITMAP), &m_bm) != 0); if (bOK) { - m_hbm = hBitmap; + m_hBitmap = hBitmap; m_eOrientation = eOrientation; - m_bHasAlphaCh = (m_bm.bmBitsPixel == 32); - m_rgbTransColor = CLR_INVALID; + m_bHasAlphaChannel = (m_bm.bmBitsPixel == 32); + m_clrTransparentColor = CLR_INVALID; } } @@ -1201,7 +1201,7 @@ private: // attach it AttachInternal(hbm, eOrientation, -1); - m_bHasAlphaCh = bHasAlphaCh; + m_bHasAlphaChannel = bHasAlphaCh; return hbm != NULL; }

1 year, 3 months

[reactos] 01/01: [CLIPBRD] Add Japanese (ja-JP) translation

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c8a990845b065ebd02a17… commit c8a990845b065ebd02a17579ef09c3496ba56c92 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Sep 2 11:27:43 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Sep 2 11:27:43 2023 +0900 [CLIPBRD] Add Japanese (ja-JP) translation CORE-18706 --- base/applications/clipbrd/clipbrd.rc | 3 ++ base/applications/clipbrd/lang/ja-JP.rc | 65 +++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) diff --git a/base/applications/clipbrd/clipbrd.rc b/base/applications/clipbrd/clipbrd.rc index 37d140b8d99..fd8f9990a45 100644 --- a/base/applications/clipbrd/clipbrd.rc +++ b/base/applications/clipbrd/clipbrd.rc @@ -50,6 +50,9 @@ CLPFILE_ICON ICON "res/clpfile.ico" #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif diff --git a/base/applications/clipbrd/lang/ja-JP.rc b/base/applications/clipbrd/lang/ja-JP.rc new file mode 100644 index 00000000000..4f221d21bc5 --- /dev/null +++ b/base/applications/clipbrd/lang/ja-JP.rc @@ -0,0 +1,65 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +ID_ACCEL ACCELERATORS +BEGIN + VK_DELETE, CMD_DELETE, VIRTKEY +END + +MAIN_MENU MENU +BEGIN + POPUP "ファイル(&F)" + BEGIN + MENUITEM "開く(&O)...", CMD_OPEN + MENUITEM "名前を付けて保存(&A)...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "終了(&X)", CMD_EXIT + END + POPUP "編集(&E)" + BEGIN + MENUITEM "削除(&D)\tDel", CMD_DELETE + END + POPUP "表示(&D)" + BEGIN + MENUITEM "自動(&A)", CMD_AUTOMATIC + END + POPUP "ヘルプ(&H)" + BEGIN + MENUITEM "ヘルプトピック(&H)", CMD_HELP + MENUITEM SEPARATOR + MENUITEM "バージョン情報(&A)", CMD_ABOUT + END +END + +STRINGTABLE +BEGIN + STRING_CLIPBOARD "クリップボードビュア" + STRING_CLIPFILE "クリップボードの要素" + STRING_DELETE_MSG "クリップボードの内容をクリアしますか?" + STRING_DELETE_TITLE "クリップボードのクリア" + STRING_FORMAT_NT "ReactOS 用のクリップボードファイル (*.clp)" + STRING_FORMAT_GEN "クリップボードファイル (*.clp)" +END + +STRINGTABLE +BEGIN + STRING_CF_UNKNOWN "未知の形式" + STRING_CF_TEXT "テキスト" + STRING_CF_BITMAP "ビットマップ" + STRING_CF_OEMTEXT "OEM テキスト" + STRING_CF_UNICODETEXT "Unicode テキスト" + STRING_CF_DIB "DIB ビットマップ" + STRING_CF_LOCALE "ロケールデータ" + STRING_CF_ENHMETAFILE "拡張メタファイル" + STRING_CF_METAFILEPICT "メタファイル" + STRING_CF_PALETTE "カラーパレット" + STRING_CF_DIBV5 "DIB ビットマップ (バージョン 5)" + STRING_CF_SYLK "シンボリックリンク形式" + STRING_CF_DIF "データ交換フォーマット" + STRING_CF_HDROP "ドロップデータ" +END + +STRINGTABLE +BEGIN + ERROR_UNSUPPORTED_FORMAT "表示できない形式のデータがクリップボードにあります。" + ERROR_INVALID_FILE_FORMAT "選択したファイルは有効なクリップボードファイルではありません。" +END

1 year, 3 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2023