Skip to content

Commit 67dd19e

Browse files
leoleo
committed
Replace OS X and Mac OS with macOS
1 parent 52350b5 commit 67dd19e

157 files changed

Lines changed: 650 additions & 650 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CONTRIBUTING-ko.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
* :non-potable_water: `:non-potable_water:` 메모리 누수를 연결했을 때
6969
* :memo: `:memo:` 문서를 작성했을 때
7070
* :penguin: `:penguin:` Linux에 대한 패치를 했을 때
71-
* :apple: `:apple:` Mac OS에 대한 패치를 했을 때
71+
* :apple: `:apple:` macOS에 대한 패치를 했을 때
7272
* :checkered_flag: `:checkered_flag:` Windows에 대한 패치를 했을 때
7373
* :bug: `:bug:` 버그를 고쳤을 때
7474
* :fire: `:fire:` 코드 또는 파일을 삭제했을 때

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ possible with your report. If you can, please include:
6565
* :non-potable_water: `:non-potable_water:` when plugging memory leaks
6666
* :memo: `:memo:` when writing docs
6767
* :penguin: `:penguin:` when fixing something on Linux
68-
* :apple: `:apple:` when fixing something on Mac OS
68+
* :apple: `:apple:` when fixing something on macOS
6969
* :checkered_flag: `:checkered_flag:` when fixing something on Windows
7070
* :bug: `:bug:` when fixing a bug
7171
* :fire: `:fire:` when removing code or files

‎README-ko.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Electron에 대한 중요한 알림을 받고 싶다면 Twitter에서
2222

2323
## 다운로드
2424

25-
Linux, Windows, OS X 용으로 미리 빌드된 Electron 바이너리와 디버그 심볼이 준비되어
25+
Linux, Windows, macOS 용으로 미리 빌드된 Electron 바이너리와 디버그 심볼이 준비되어
2626
있습니다. [releases](https://github.com/electron/electron/releases) 페이지에서
2727
받아 볼 수 있습니다.
2828

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ behavior to electron@github.com.
1919

2020
## Downloads
2121

22-
Prebuilt binaries and debug symbols of Electron for Linux, Windows and OS X can
22+
Prebuilt binaries and debug symbols of Electron for Linux, Windows and macOS can
2323
be found on the [releases](https://github.com/electron/electron/releases) page.
2424

2525
You can also use [`npm`](https://docs.npmjs.com/) to install prebuilt electron

‎atom/browser/atom_browser_main_parts.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ void AtomBrowserMainParts::PreMainMessageLoopRun() {
148148
#endif
149149

150150
#if !defined(OS_MACOSX)
151-
// The corresponding call in OS X is in AtomApplicationDelegate.
151+
// The corresponding call in macOS is in AtomApplicationDelegate.
152152
Browser::Get()->WillFinishLaunching();
153153
Browser::Get()->DidFinishLaunching();
154154
#endif

‎atom/browser/browser_mac.mm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
if (!bundleList) {
5959
return false;
6060
}
61-
// On Mac OS X, we can't query the default, but the handlers list seems to put
61+
// On macOS, we can't query the default, but the handlers list seems to put
6262
// Apple's defaults first, so we'll use the first option that isn't our bundle
6363
CFStringRef other = nil;
6464
for (CFIndex i = 0; i < CFArrayGetCount(bundleList); i++) {

‎atom/browser/browser_observer.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class BrowserObserver {
3333
virtual void OnQuit() {}
3434

3535
// The browser has opened a file by double clicking in Finder or dragging the
36-
// file to the Dock icon. (OS X only)
36+
// file to the Dock icon. (macOS only)
3737
virtual void OnOpenFile(bool* prevent_default,
3838
const std::string& file_path) {}
3939

@@ -53,7 +53,7 @@ class BrowserObserver {
5353
const base::DictionaryValue& request_details) {}
5454

5555
#if defined(OS_MACOSX)
56-
// The browser wants to resume a user activity via handoff. (OS X only)
56+
// The browser wants to resume a user activity via handoff. (macOS only)
5757
virtual void OnContinueUserActivity(
5858
bool* prevent_default,
5959
const std::string& type,

‎atom/browser/native_window.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ class NativeWindow : public base::SupportsUserData,
320320
base::CancelableClosure window_unresposive_closure_;
321321

322322
// Used to display sheets at the appropriate horizontal and vertical offsets
323-
// on OS X.
323+
// on macOS.
324324
double sheet_offset_x_;
325325
double sheet_offset_y_;
326326

‎atom/browser/native_window_mac.mm‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ - (void)windowWillExitFullScreen:(NSNotification*)notification {
232232
}
233233

234234
- (void)windowDidExitFullScreen:(NSNotification*)notification {
235-
// For certain versions of OS X the fullscreen button will automatically show
235+
// For certain versions of macOS the fullscreen button will automatically show
236236
// after exiting fullscreen mode.
237237
if (!shell_->has_frame()) {
238238
NSWindow* window = shell_->GetNativeWindow();
@@ -537,7 +537,7 @@ static bool FromV8(v8::Isolate* isolate, v8::Handle<v8::Value> val,
537537
[window_ setToolbar:toolbar];
538538
}
539539

540-
// On OS X the initial window size doesn't include window frame.
540+
// On macOS the initial window size doesn't include window frame.
541541
bool use_content_size = false;
542542
options.Get(options::kUseContentSize, &use_content_size);
543543
if (!has_frame() || !use_content_size)
@@ -1041,7 +1041,7 @@ static bool FromV8(v8::Isolate* isolate, v8::Handle<v8::Value> val,
10411041
[[window_ standardWindowButton:NSWindowMiniaturizeButton] setHidden:YES];
10421042
[[window_ standardWindowButton:NSWindowCloseButton] setHidden:YES];
10431043

1044-
// Some third-party OS X utilities check the zoom button's enabled state to
1044+
// Some third-party macOS utilities check the zoom button's enabled state to
10451045
// determine whether to show custom UI on hover, so we disable it here to
10461046
// prevent them from doing so in a frameless app window.
10471047
[[window_ standardWindowButton:NSWindowZoomButton] setEnabled:NO];
@@ -1111,7 +1111,7 @@ static bool FromV8(v8::Isolate* isolate, v8::Handle<v8::Value> val,
11111111
else
11121112
[window_ setStyleMask:[window_ styleMask] & (~flag)];
11131113
// Change style mask will make the zoom button revert to default, probably
1114-
// a bug of Cocoa or OS X.
1114+
// a bug of Cocoa or macOS.
11151115
if (!zoom_button_enabled)
11161116
SetMaximizable(false);
11171117
}
@@ -1123,7 +1123,7 @@ static bool FromV8(v8::Isolate* isolate, v8::Handle<v8::Value> val,
11231123
else
11241124
[window_ setCollectionBehavior:[window_ collectionBehavior] & (~flag)];
11251125
// Change collectionBehavior will make the zoom button revert to default,
1126-
// probably a bug of Cocoa or OS X.
1126+
// probably a bug of Cocoa or macOS.
11271127
if (!zoom_button_enabled)
11281128
SetMaximizable(false);
11291129
}

‎atom/browser/ui/message_box_mac.mm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ - (void)alertDidEnd:(NSAlert*)alert
7979

8080
for (size_t i = 0; i < buttons.size(); ++i) {
8181
NSString* title = base::SysUTF8ToNSString(buttons[i]);
82-
// An empty title causes crash on OS X.
82+
// An empty title causes crash on macOS.
8383
if (buttons[i].empty())
8484
title = @"(empty)";
8585
NSButton* button = [alert addButtonWithTitle:title];

0 commit comments

Comments
 (0)