-
Notifications
You must be signed in to change notification settings - Fork 709
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update Japanese Translation #272
Conversation
Update suggest_ja-JP.db
I recreated the PR to exclude "README.ja.md". It is my fault that I forgot to write this to the description.
I fixed back "子" into "サブ". |
I made changes to these words in this PR:
|
Maybe you can find someone who is a native speaker of Japanese to review this PR? I don't know how a MS project accept a large PR about translation. @craigwi |
I think contributors in azure-docs.ja-jp may review this PR, but I have not contacted them yet. PS: I can subdivide this PR as long as time allows. Should I? |
(I, personally speaking, think some expressions and forms of this software (seldom using of honorific form) make this retro software "more like a 1990s thing", such as half-width katakana |
We now have two PRs with Japanese translation, which most likley already have conflicts To get out of this I suggest that
@craigwims: What do you think? |
Thank you for the reply. I mechanically replaced all full-width katakanas with half-width katakanas. I will copy these files into this PR branch if this is no problem. |
I would like to add an option to switch between half-width and full-width katakanas. May I add a new language (lang code: |
Sorry forgive me may lack japanese know-how with respect to half/full-width katakanas, but I think as first we should try to get this PR consistently through. If you ask me I would create a possible half-width katakana language in an extra PR and most likely after the planned release, but @craigwims is the boss here :-) |
I would prefer to separate the half-width / full-width question to a separate PR. Let's make this PR to be consistent with respect to width and get final input from those mentioned above. |
Certainly. I will create an issue to discuss about switching half or full width. |
What are the remaining steps / approvals needed on this PR? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I reviewed
@@ -75,7 +75,7 @@ BEGIN | |||
WS_BORDER | WS_VSCROLL | |||
|
|||
DEFPUSHBUTTON "OK", IDOK, 218, 6, 40, 14, WS_GROUP | |||
PUSHBUTTON "キャンセル", IDCANCEL, 218, 23, 40, 14, WS_GROUP | |||
PUSHBUTTON "キャンセル", IDCANCEL, 218, 23, 40, 14, WS_GROUP |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does "キャンセル" fit inside the button?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@@ -93,7 +93,7 @@ BEGIN | |||
CONTROL "ドライブ(&D):", IDD_DRIVE1, "static", SS_LEFTNOWORDWRAP | WS_CHILD, 5, 5, 41, 10 | |||
CONTROL "", IDD_DRIVE, "listbox", LBS_NOTIFY | LBS_SORT | LBS_STANDARD | LBS_USETABSTOPS | WS_BORDER | WS_VSCROLL | WS_CHILD | WS_TABSTOP, 5, 16, 140, 60 | |||
CONTROL "OK", IDOK, "button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_CHILD, 155, 6, 40, 14 | |||
CONTROL "キャンセル", IDCANCEL, "button", BS_PUSHBUTTON | WS_TABSTOP | WS_CHILD, 155, 23, 40, 14 | |||
CONTROL "キャンセル", IDCANCEL, "button", BS_PUSHBUTTON | WS_TABSTOP | WS_CHILD, 155, 23, 40, 14 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does "キャンセル" fit inside the button?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@@ -108,7 +108,7 @@ BEGIN | |||
CONTROL "実行時に最小化(&M)", IDD_LOAD, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_CHILD, 3, 45, 91, 12 | |||
CONTROL "管理者として実行(&A)", IDD_RUNAS, "button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_CHILD, 84, 45, 91, 12 | |||
CONTROL "OK", 1, "button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_CHILD, 165, 6, 40, 14 | |||
CONTROL "キャンセル", 2, "button", BS_PUSHBUTTON | WS_TABSTOP | WS_CHILD, 165, 23, 40, 14 | |||
CONTROL "キャンセル", 2, "button", BS_PUSHBUTTON | WS_TABSTOP | WS_CHILD, 165, 23, 40, 14 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does "キャンセル" fit inside the button?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@@ -122,7 +122,7 @@ BEGIN | |||
CONTROL "", IDD_NAME, "edit", ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | WS_CHILD, 5, 29, 60, 12 | |||
CONTROL "選択(&S)", IDOK, "button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_CHILD, 70, 6, 40, 14 | |||
CONTROL "解除(&D)", IDYES, "button", BS_PUSHBUTTON | WS_TABSTOP | WS_CHILD, 70, 23, 40, 14 | |||
CONTROL "キャンセル", IDCANCEL, "button", BS_PUSHBUTTON | WS_TABSTOP | WS_CHILD, 70, 40, 40, 14 | |||
CONTROL "キャンセル", IDCANCEL, "button", BS_PUSHBUTTON | WS_TABSTOP | WS_CHILD, 70, 40, 40, 14 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does "キャンセル" fit inside the button?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@@ -145,7 +145,7 @@ BEGIN | |||
CONTROL "はい(&Y)", IDYES, "button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_CHILD, 33, 73, 40, 14 | |||
CONTROL "全て(&A)", IDD_YESALL, "button", BS_PUSHBUTTON | WS_TABSTOP | WS_CHILD, 79, 73, 40, 14 | |||
CONTROL "いいえ(&N)", IDNO, "button", BS_PUSHBUTTON | WS_TABSTOP | WS_CHILD, 125, 73, 40, 14 | |||
CONTROL "キャンセル", IDCANCEL, "button", BS_PUSHBUTTON | WS_TABSTOP | WS_CHILD, 171, 73, 40, 14 | |||
CONTROL "キャンセル", IDCANCEL, "button", BS_PUSHBUTTON | WS_TABSTOP | WS_CHILD, 171, 73, 40, 14 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does "キャンセル" fit inside the button?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@@ -674,7 +674,7 @@ STYLE WS_BORDER | DS_MODALFRAME | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSME | |||
BEGIN | |||
CONTROL "ファイルを印刷中...", -1, "static", SS_CENTER | WS_GROUP | WS_CHILD, 4, 6, 120, 12 | |||
CONTROL "", IDD_TEXT, "static", SS_CENTER | SS_NOPREFIX | WS_GROUP | WS_CHILD, 4, 20, 120, 12 | |||
CONTROL "キャンセル", 2, "button", BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP | WS_CHILD, 44, 40, 32, 14 | |||
CONTROL "キャンセル", 2, "button", BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP | WS_CHILD, 44, 40, 32, 14 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does "キャンセル" fit inside the button?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@@ -691,7 +691,7 @@ BEGIN | |||
CONTROL "移動先:", -1, "static", SS_RIGHT | WS_CHILD, 5, 42, 50, 11 | |||
CONTROL "", IDD_DIR, "edit", ES_READONLY | ES_LEFT | ES_AUTOHSCROLL | WS_TABSTOP | WS_CHILD, 57, 42, 130, 12 | |||
CONTROL "OK", IDOK, "button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_CHILD, 205, 4, 40, 14 | |||
CONTROL "キャンセル", IDCANCEL, "button", BS_PUSHBUTTON | WS_TABSTOP | WS_CHILD, 205, 20, 40, 14 | |||
CONTROL "キャンセル", IDCANCEL, "button", BS_PUSHBUTTON | WS_TABSTOP | WS_CHILD, 205, 20, 40, 14 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does "キャンセル" fit inside the button?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@@ -759,7 +759,7 @@ BEGIN | |||
#endif | |||
PUSHBUTTON "ブラウズ(&B)...", IDD_BROWSE, 130, 24, 47, 14 | |||
DEFPUSHBUTTON "OK", IDOK, 187, 6, 62, 14, WS_GROUP | |||
PUSHBUTTON "キャンセル", IDCANCEL, 187, 23, 62, 14 | |||
PUSHBUTTON "キャンセル", IDCANCEL, 187, 23, 62, 14 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does "キャンセル" fit inside the button?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@@ -835,7 +835,7 @@ BEGIN | |||
CONTROL "これらの変更の中には再起動後に有効になる物があります。\n注意して下さい。", | |||
IDD_TEXT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 15, 90, 200, 20 | |||
CONTROL "OK", IDOK, "button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 55, 120, 40, 14 | |||
CONTROL "キャンセル", IDCANCEL, "button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 120, 40, 14 | |||
CONTROL "キャンセル", IDCANCEL, "button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 120, 40, 14 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does "キャンセル" fit inside the button?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@craigwims @Takym Line 338 TO: Line 111~ Line 113 TO: Line 605~ Line 607 TO: |
I guess we may revert all changes about half-width katakanas, making this PR a "smaller but urgent" one... Half-width katakanas and many other old-fashioned translations were here for historical reasons, so I would like to know @craigwims and others' opinion in a more general way: are we going to preserve original old-fashioned translations as much as possible or to adopt modern ones whenever suitable?
...I don't speak Japanese either, so I may just give some ideas and let them two to decide. |
but there is still some work to do, for example checking every button's width, since full-width version is (almost) 2x longer. In the worst case it may be hard to maintain two flavours (half- or full-) elegantly using that code, because of different width between them (buttons either too big for half-width or not enough for full-width, or both) |
- "ディレクスト" ---> "ディレクトリ" - "ディレクトリー" ---> "ディレクトリ" - "セキュリティー" ---> "セキュリティ"
@@ -417,7 +418,7 @@ JAPANEND | |||
|
|||
IDS_DRAG_COPYING "%s へファイルをコピー中" | |||
IDS_DRAG_MOVING "%s へファイルを移動中" | |||
IDS_DRAG_LINKING "ファイルを %s にリンクする" | |||
IDS_DRAG_LINKING "ファイルを %s にリンクする" | |||
IDS_DRAG_EXECUTING "%s でファイルを実行中" | |||
|
|||
IDS_ORDERB "%s バイト" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think "%s バイト" should be "%s B" for symmetry. What do you think?
Other units:
IDS_ORDERKB "%s KB"
IDS_ORDERMB "%s MB"
IDS_ORDERGB "%s GB"
IDS_ORDERTB "%s TB"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
However, the byte unit is labeled "%s bytes" in English.
Lines 425 to 429 in 1f796ed
IDS_ORDERB "%s bytes" | |
IDS_ORDERKB "%sKB" | |
IDS_ORDERMB "%sMB" | |
IDS_ORDERGB "%sGB" | |
IDS_ORDERTB "%sTB" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think IDS_ORDERB's transration is "%s バイト".
I think it is better to match the expression in english and other language.
The [Option] > [Toolbar] menu is garbled in Japanese, but the [Option] > [Customize Toolbar...] menu is not garbled. Lines 87 to 90 in 7568ef5
JapaneseEnglishPostscript: I did not change "ツール バー" texts. |
@tokomio-sun @clzls |
That's odd I played a bit with indenting the text in the .rc file and if you take the .rc file from this commit 36128be then it works This seems to be a bug in the resource compiler |
@schinagl I merged your workaround. Thanks. |
Are we good to go now with this PR? |
I would like @tokomio-sun to re-review my changes. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Takym
Thank you to your work.
I re-reviewed.
src/lang/res_ja-JP.rc
Outdated
@@ -417,7 +418,7 @@ JAPANEND | |||
|
|||
IDS_DRAG_COPYING "%s へファイルをコピー中" | |||
IDS_DRAG_MOVING "%s へファイルを移動中" | |||
IDS_DRAG_LINKING "ファイルを %s にリンクする" | |||
IDS_DRAG_LINKING "ファイルを %s にリンクする" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have merged #355.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Takym
I reviewed.
Thank you for your cooperation.
Thanks to all contributors here for the great collaboration. Merging now. |
Thank you all for merging! |
* Update res_ja-JP.rc * Update suggest_ja-JP.db * Update winfile_ja-JP.dlg * Change "子ディレクトリ" to "サブディレクトリ" * Change "作業ディレクトリ" to "現在のディレクトリ" * Fix japanese dialog text for creating SymbolicLink, Hardlinks and Junctions * fix-line.420 * fix japanese translation (Line 420) * Convert Full Width % to Half Width % * Fixed res_ja-JP.rc - "ディレクスト" ---> "ディレクトリ" - "ディレクトリー" ---> "ディレクトリ" - "セキュリティー" ---> "セキュリティ" * Fixed `res_ja-JP.rc` (window arrangement) * Fix Japanese garbling * Fix garbling at the search box (Japanese) Co-authored-by: tokomio-sun <[email protected]> Co-authored-by: schinagl <[email protected]>
Hello
I updated the Japanese translations.
2022/11/16: This PR contains #355