diff --git a/program/Language.cs b/program/Language.cs index e6a7bfc..6099c91 100644 --- a/program/Language.cs +++ b/program/Language.cs @@ -153,7 +153,10 @@ string[] parts = line.Split(new[] { ',' }, 2); if (parts.Length < 2) continue; - result[parts[0].Trim()] = parts[1]; // value keeps any commas + // Value keeps any commas. "\n" in the CSV becomes a real line break, + // so a translator controls where a message wraps instead of leaving + // it to Pango, which breaks Japanese at arbitrary characters. + result[parts[0].Trim()] = parts[1].Replace("\\n", "\n"); } return result; diff --git a/program/MainWindow.cs b/program/MainWindow.cs index 6d60b9f..28cdc98 100644 --- a/program/MainWindow.cs +++ b/program/MainWindow.cs @@ -674,6 +674,7 @@ var msg = new Label(_Language["Close.ConfirmPowerOff"]); msg.Name = "PowerOffMessage"; msg.LineWrap = true; + msg.LineWrapMode = Pango.WrapMode.WordChar; msg.Justify = Justification.Center; Box content = dlg.ContentArea; diff --git a/program/info_eng.csv b/program/info_eng.csv index 2a4c5f0..2d33a29 100644 --- a/program/info_eng.csv +++ b/program/info_eng.csv @@ -30,7 +30,7 @@ BatteryIcon.Charging,Battery {0}% — charging BatteryIcon.Discharging,Battery {0}% BatteryIcon.Full,Battery fully charged -Close.ConfirmPowerOff,Shut down the tablet? +Close.ConfirmPowerOff,The tablet will shut down.\nAre you sure? Close.ShuttingDown,Shutting down... Common.Cancel,Cancel Common.PowerOff,Shut Down \ No newline at end of file diff --git a/program/info_jpn.csv b/program/info_jpn.csv index 41e131f..350e39f 100644 --- a/program/info_jpn.csv +++ b/program/info_jpn.csv @@ -30,7 +30,7 @@ BatteryIcon.Charging,バッテリー {0}% — 充電中 BatteryIcon.Discharging,バッテリー {0}% BatteryIcon.Full,バッテリー 満充電 -Close.ConfirmPowerOff,タブレットの電源を切ります。よろしいですか? +Close.ConfirmPowerOff,タブレットの電源を切ります\nよろしいですか? Close.ShuttingDown,シャットダウン中... Common.Cancel,キャンセル Common.PowerOff,電源を切る \ No newline at end of file diff --git a/program/touch_friendly.css b/program/touch_friendly.css index fbcd824..3a5b7e6 100644 --- a/program/touch_friendly.css +++ b/program/touch_friendly.css @@ -232,7 +232,7 @@ font-size: 40px; font-weight: 700; color: #1e1e1e; - margin: 44px 40px 28px 40px; + margin: 36px 40px 24px 40px; } #PowerOffDialog button {