Merge branch 'feature/1099_readonly'

coteditor · Jan 19, 2025 · c1a3ebe · c1a3ebe
2 parents aaf9a8b + 6645fc4
commit c1a3ebe
Show file tree

Hide file tree

Showing 19 changed files with 817 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,9 +5,16 @@
 
 ### New Features
 
+- The new “prevent editing” option that prevents documents from being unintentionally edited.
 - Append the nearest unique ancestor folder name to the document title if multiple documents with the same name are opened.
 
 
+### TODO
+
+- Localize new strings.
+- Update the What’s New panel.
+
+
 
 5.0.8 (692)
 --------------------------

diff --git a/CotEditor/Resources/CotEditor.help/Contents/Resources/en.lproj/CotEditor.cshelpindex b/CotEditor/Resources/CotEditor.help/Contents/Resources/en.lproj/CotEditor.cshelpindex
diff --git a/CotEditor/Resources/CotEditor.help/Contents/Resources/en.lproj/pgs/howto_readonly.html b/CotEditor/Resources/CotEditor.help/Contents/Resources/en.lproj/pgs/howto_readonly.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+	<meta charset="UTF-8"/>
+	<meta name="keywords" content="readonly, read-only, prevent editing, allow editing, lock, unlock"/>
+	<link rel="stylesheet" href="../../Shared/sty/standard.css"/>
+	<script defer src="../../Shared/js/toc.js"></script>
+
+	<title>Make read-only documents in CotEditor on Mac</title>
+</head>
+
+<body>
+
+<h1>Make read-only documents in CotEditor on Mac</h1>
+
+<p>In CotEditor, you can make a document read-only so it can’t be edited, or lock it so it can’t be edited or deleted.</p>
+
+<p>If you own a read-only or locked document, you can edit it after removing its read-only state or unlocking it. Others can only edit a copy of the document.</p>
+</figure>
+
+<h2>Preventing from being edited</h2>
+
+<p>CotEditor can temporarily prevent a document from being edited to avoid unintended data modifications while reading. This state is only valid while the document is open in CotEditor and is not saved to the file.</p>
+
+<ul>
+	<li>To prevent a document from being edited, choose Format &gt; Prevent Editing.</li>
+
+	<li>To open a document as read-only, choose File &gt; Open, and select the “Open as read-only” checkbox in the Open dialog.</li>
+
+	<li>To allow editing a document being prevented from editing, choose Format &gt; Allow Editing.</li>
+</ul>
+
+
+<h2>Lock</h2>
+
+<p>The lock is the feature in the macOS system to protect documents from being accidentally changed or deleted. This state is saved in the file and persists when working with the document from other apps on Mac.
+</p>
+
+<ul>
+	<li>To lock a document, place the pointer to the right of the document title at the top of the document window, click the arrow that appears, then select Locked.</li>
+	<li>To unlock a document, deselect Locked.</li>
+</ul>
+
+<p>You can also lock or unlock a document from the Finder. See <a href="https://support.apple.com/ja-jp/guide/mac-help/mchlp1342/mac" rel="external">Lock a document on Mac</a> for details of the Lock feature on Mac.</p>
+
+</body>
+</html>
diff --git a/CotEditor/Resources/CotEditor.help/Contents/Resources/en.lproj/toc.html b/CotEditor/Resources/CotEditor.help/Contents/Resources/en.lproj/toc.html
@@ -22,6 +22,7 @@ <h1>Table of Contents</h1>
 		<ul>
 			<li><a href="pgs/howto_inspect_fileinfo.html">Get information about a document</a></li>
 			<li><a href="pgs/howto_inspect_character.html">Get information about a character</a></li>
+			<li><a href="pgs/howto_readonly.html">Make read-only documents</a></li>
 			<li><a href="pgs/about_line_endings.html">Handle various types of line endings</a></li>
 			<li><a href="pgs/howto_find_inconsistent_line_endings.html">Find inconsistent line endings</a></li>
 			<li><a href="pgs/howto_jump.html">Go to a specific line</a></li>

diff --git a/CotEditor/Resources/CotEditor.help/Contents/Resources/ja.lproj/CotEditor.cshelpindex b/CotEditor/Resources/CotEditor.help/Contents/Resources/ja.lproj/CotEditor.cshelpindex
diff --git a/CotEditor/Resources/CotEditor.help/Contents/Resources/ja.lproj/pgs/howto_readonly.html b/CotEditor/Resources/CotEditor.help/Contents/Resources/ja.lproj/pgs/howto_readonly.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html lang="ja">
+
+<head>
+	<meta charset="UTF-8"/>
+	<meta name="keywords" content="読み出し専用, readonly, read-only, 編集不可, 編集可能, ロック"/>
+	<link rel="stylesheet" href="../../Shared/sty/standard.css"/>
+	<script defer src="../../Shared/js/toc.js"></script>
+
+	<title>MacのCotEditorで読み出し専用の書類にする</title>
+</head>
+
+<body>
+
+<h1>MacのCotEditorで読み出し専用の書類にする</h1>
+
+<p>CotEditorでは、書類を編集できないように読み出し専用に設定したり、編集や削除ができないようにロックしたりすることができます。</p>
+
+<p>読み出し専用またはロックされた書類の場合は、読み出し専用状態またはロックを解除したあとに書類を編集できます。他のユーザは書類のコピーのみを編集できます。</p>
+
+
+<h2>編集不可にする</h2>
+
+<p>意図しないデータの変更を避けるために、CotEditorは書類を一時的に編集できないようにすることができます。状態はCotEditorで書類を開いている間のみ有効であり、ファイルには保存されません。</p>
+
+<ul>
+	<li>書類を編集不可にするには、「フォーマット」＞「編集不可にする」と選択します。</li>
+
+	<li>書類を読み出し専用で開くには、「ファイル」 ＞ 「開く」を選択し、「開く」ダイアログの「読み出し専用で開く」チェックボックスを有効にする。</li>
+
+	<li>編集不可の書類をふたたび編集可能にするには、「フォーマット」＞「編集可能にする」と選択します。</li>
+</ul>
+
+
+<h2>ロック</h2>
+
+<p>ロックは、書類が誤って変更されたり削除されたりするのを防ぐmacOSの機能です。状態はファイルに保存され、Mac上のほかのアプリから書類を操作する際にも引き継がれます。</p>
+
+<ul>
+	<li>書類をロックするには、書類ウインドウ上部の書類のタイトルの右にポインタを置き、表示される矢印をクリックして、「ロック」を選択します。</li>
+	<li>書類のロックを解除するには、「ロック」の選択を解除します。</li>
+</ul>
+
+<p>書類をFinderからロックまたはロック解除することもできます。Macのロック機能について詳しくは「<a href="https://support.apple.com/en/guide/mac-help/mchlp1342/mac" rel="external">Macで書類をロックする</a>」を参照してください。</p>
+
+</body>
+</html>
diff --git a/CotEditor/Resources/CotEditor.help/Contents/Resources/ja.lproj/toc.html b/CotEditor/Resources/CotEditor.help/Contents/Resources/ja.lproj/toc.html
@@ -22,6 +22,7 @@ <h1>目次</h1>
 		<ul>
 			<li><a href="pgs/howto_inspect_fileinfo.html">書類の情報を見る</a></li>
 			<li><a href="pgs/howto_inspect_character.html">文字情報を表示する</a></li>
+			<li><a href="pgs/howto_readonly.html">読み出し専用の書類にする</a></li>
 			<li><a href="pgs/about_line_endings.html">多様な改行コードを扱う</a></li>
 			<li><a href="pgs/howto_find_inconsistent_line_endings.html">混在する改行コードを探す</a></li>
 			<li><a href="pgs/howto_jump.html">特定の行に移動する</a></li>

diff --git a/CotEditor/Resources/Localizables/Application/MainMenu.xcstrings b/CotEditor/Resources/Localizables/Application/MainMenu.xcstrings
@@ -1,6 +1,94 @@
 {
   "sourceLanguage" : "en",
   "strings" : {
+    "Allow Editing" : {
+      "localizations" : {
+        "cs" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Povolit úpravy"
+          }
+        },
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Bearbeitung zulassen"
+          }
+        },
+        "en-GB" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Allow Editing"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Permitir edición"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Autoriser les modifications"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Consenti modifiche"
+          }
+        },
+        "ja" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "編集可能にする"
+          }
+        },
+        "ko" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "편집 허용"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Sta bewerking toe"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Pozwalaj na edycję"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Permitir Edição"
+          }
+        },
+        "tr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Düzenlemeye İzin Ver"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "允许编辑"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "允許編輯"
+          }
+        }
+      }
+    },
     "Bigger" : {
       "localizations" : {
         "cs" : {
@@ -2299,6 +2387,94 @@
         }
       }
     },
+    "Prevent Editing" : {
+      "localizations" : {
+        "cs" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Zabránit úpravám"
+          }
+        },
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Vor Bearbeitung schützen"
+          }
+        },
+        "en-GB" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Prevent Editing"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Impedir edición"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Empêcher les modifications"
+          }
+        },
+        "it" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Impedisci modifiche"
+          }
+        },
+        "ja" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "編集不可にする"
+          }
+        },
+        "ko" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "편집 허용 안 함"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Sta bewerking niet toe"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Nie pozwalaj na edycję"
+          }
+        },
+        "pt" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Impedir Edição"
+          }
+        },
+        "tr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Düzenlemeyi Engelle"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "防止编辑"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "不允許編輯"
+          }
+        }
+      }
+    },
     "Reset to Default" : {
       "localizations" : {
         "cs" : {

diff --git a/...ditor/Resources/Localizables/Document Window/Accessory Views/OpenPanelAccessory.xcstrings b/...ditor/Resources/Localizables/Document Window/Accessory Views/OpenPanelAccessory.xcstrings
@@ -90,6 +90,41 @@
         }
       }
     },
+    "Open as read-only" : {
+      "comment" : "toggle button label",
+      "localizations" : {
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Mit Schreibschutz öffnen"
+          }
+        },
+        "en-GB" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Open as read-only"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "needs_review",
+            "value" : "Abrir como solo lectura"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Ouvrir en lecture seule"
+          }
+        },
+        "ja" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "読み出し専用で開く"
+          }
+        }
+      }
+    },
     "Show invisible files" : {
       "comment" : "toggle button label",
       "localizations" : {