Skip to content

Commit ef01cfe

Browse files
committed
Merge branch 'PluginStore' of github.com:onesounds/Flow.Launcher into PluginStore
2 parents fd70326 + ead14f2 commit ef01cfe

File tree

5 files changed

+146
-40
lines changed

5 files changed

+146
-40
lines changed

Flow.Launcher/Languages/en.xaml

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,35 @@
1313
<system:String x:Key="iconTraySettings">Settings</system:String>
1414
<system:String x:Key="iconTrayAbout">About</system:String>
1515
<system:String x:Key="iconTrayExit">Exit</system:String>
16+
<system:String x:Key="closeWindow">Close</system:String>
1617

1718
<!--Setting General-->
1819
<system:String x:Key="flowlauncher_settings">Flow Launcher Settings</system:String>
1920
<system:String x:Key="general">General</system:String>
2021
<system:String x:Key="portableMode">Portable Mode</system:String>
22+
<system:String x:Key="portableModeToolTIp">All setting into single folder. You can use with USB drive or cloud.</system:String>
2123
<system:String x:Key="startFlowLauncherOnSystemStartup">Start Flow Launcher on system startup</system:String>
2224
<system:String x:Key="hideFlowLauncherWhenLoseFocus">Hide Flow Launcher when focus is lost</system:String>
2325
<system:String x:Key="dontPromptUpdateMsg">Do not show new version notifications</system:String>
2426
<system:String x:Key="rememberLastLocation">Remember last launch location</system:String>
2527
<system:String x:Key="language">Language</system:String>
2628
<system:String x:Key="lastQueryMode">Last Query Style</system:String>
29+
<system:String x:Key="lastQueryModeToolTip">When you open Query box, decide what to do.</system:String>
2730
<system:String x:Key="LastQueryPreserved">Preserve Last Query</system:String>
2831
<system:String x:Key="LastQuerySelected">Select last Query</system:String>
2932
<system:String x:Key="LastQueryEmpty">Empty last Query</system:String>
3033
<system:String x:Key="maxShowResults">Maximum results shown</system:String>
3134
<system:String x:Key="ignoreHotkeysOnFullscreen">Ignore hotkeys in fullscreen mode</system:String>
35+
<system:String x:Key="ignoreHotkeysOnFullscreenToolTip">If you're a gamer, We recommend turning it on.</system:String>
3236
<system:String x:Key="pythonDirectory">Python Directory</system:String>
3337
<system:String x:Key="autoUpdates">Auto Update</system:String>
34-
<system:String x:Key="autoHideScrollBar">Auto Hide Scroll Bar</system:String>
35-
<system:String x:Key="autoHideScrollBarToolTip">Automatically hides the Settings window scroll bar and show when hover the mouse over it</system:String>
38+
<system:String x:Key="autoHideScrollBar">Auto Hide Scroll Bar in Setting</system:String>
39+
<system:String x:Key="autoHideScrollBarToolTip">If you feel the scroll bar in the setting window is small, We recommend turning it off.</system:String>
3640
<system:String x:Key="selectPythonDirectory">Select</system:String>
3741
<system:String x:Key="hideOnStartup">Hide Flow Launcher on startup</system:String>
3842
<system:String x:Key="hideNotifyIcon">Hide tray icon</system:String>
3943
<system:String x:Key="querySearchPrecision">Query Search Precision</system:String>
44+
<system:String x:Key="querySearchPrecisionToolTip">Search results become more accurate.</system:String>
4045
<system:String x:Key="ShouldUsePinyin">Should Use Pinyin</system:String>
4146
<system:String x:Key="ShouldUsePinyinToolTip">Allows using Pinyin to search. Pinyin is the standard system of romanized spelling for translating Chinese</system:String>
4247
<system:String x:Key="shadowEffectNotAllowed">Shadow effect is not allowed while current theme has blur effect enabled</system:String>
@@ -57,6 +62,12 @@
5762
<system:String x:Key="plugin_init_time">Init time:</system:String>
5863
<system:String x:Key="plugin_query_time">Query time:</system:String>
5964

65+
66+
<!--Setting Plugin Store-->
67+
<system:String x:Key="pluginStore">Plugin Store</system:String>
68+
<system:String x:Key="refresh">Refresh</system:String>
69+
<system:String x:Key="install">Install</system:String>
70+
6071
<!--Setting Theme-->
6172
<system:String x:Key="theme">Theme</system:String>
6273
<system:String x:Key="browserMoreThemes">Browse for more themes</system:String>
@@ -67,12 +78,17 @@
6778
<system:String x:Key="opacity">Opacity</system:String>
6879
<system:String x:Key="theme_load_failure_path_not_exists">Theme {0} not exists, fallback to default theme</system:String>
6980
<system:String x:Key="theme_load_failure_parse_error">Fail to load theme {0}, fallback to default theme</system:String>
81+
<system:String x:Key="ThemeFolder">Theme Folder</system:String>
82+
<system:String x:Key="OpenThemeFolder">Open Theme Folder</system:String>
7083

7184
<!--Setting Hotkey-->
7285
<system:String x:Key="hotkey">Hotkey</system:String>
7386
<system:String x:Key="flowlauncherHotkey">Flow Launcher Hotkey</system:String>
87+
<system:String x:Key="flowlauncherHotkeyToolTip">Enter the shortcut that open the Flow Launcher.</system:String>
7488
<system:String x:Key="openResultModifiers">Open Result Modifiers</system:String>
89+
<system:String x:Key="openResultModifiersToolTip">Shortcuts to select the result list.</system:String>
7590
<system:String x:Key="showOpenResultHotkey">Show Hotkey</system:String>
91+
<system:String x:Key="showOpenResultHotkeyToolTip">Display Shortcut in Result list .</system:String>
7692
<system:String x:Key="customQueryHotkey">Custom Query Hotkey</system:String>
7793
<system:String x:Key="customQuery">Query</system:String>
7894
<system:String x:Key="delete">Delete</system:String>
@@ -117,6 +133,7 @@
117133
<system:String x:Key="documentation">Usage Tips:</system:String>
118134

119135
<!--Priority Setting Dialog-->
136+
<system:String x:Key="changePriorityWindow">Change Priority</system:String>
120137
<system:String x:Key="priority_tips">Greater the number, the higher the result will be ranked. Try setting it as 5. If you want the results to be lower than any other plugin's, provide a negative number</system:String>
121138
<system:String x:Key="invalidPriority">Please provide an valid integer for Priority!</system:String>
122139

Flow.Launcher/Languages/ko.xaml

Lines changed: 64 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,55 +13,92 @@
1313
<system:String x:Key="iconTraySettings">설정</system:String>
1414
<system:String x:Key="iconTrayAbout">정보</system:String>
1515
<system:String x:Key="iconTrayExit">종료</system:String>
16+
<system:String x:Key="closeWindow">닫기</system:String>
1617

1718
<!--Setting General-->
1819
<system:String x:Key="flowlauncher_settings">Flow Launcher 설정</system:String>
1920
<system:String x:Key="general">일반</system:String>
21+
<system:String x:Key="portableMode">포터블 모드</system:String>
22+
<system:String x:Key="portableModeToolTIp">모든 설정이 폴더안에 들어갑니다. USB 드라이브나 클라우드로 사용 가능합니다.</system:String>
2023
<system:String x:Key="startFlowLauncherOnSystemStartup">시스템 시작 시 Flow Launcher 실행</system:String>
2124
<system:String x:Key="hideFlowLauncherWhenLoseFocus">포커스 잃으면 Flow Launcher 숨김</system:String>
2225
<system:String x:Key="dontPromptUpdateMsg">새 버전 알림 끄기</system:String>
2326
<system:String x:Key="rememberLastLocation">마지막 실행 위치 기억</system:String>
2427
<system:String x:Key="language">언어</system:String>
2528
<system:String x:Key="lastQueryMode">마지막 쿼리 스타일</system:String>
29+
<system:String x:Key="lastQueryModeToolTip">쿼리박스를 열었을 때 쿼리 처리 방식</system:String>
2630
<system:String x:Key="LastQueryPreserved">직전 쿼리에 계속 입력</system:String>
2731
<system:String x:Key="LastQuerySelected">직전 쿼리 내용 선택</system:String>
2832
<system:String x:Key="LastQueryEmpty">직전 쿼리 지우기</system:String>
2933
<system:String x:Key="maxShowResults">표시할 결과 수</system:String>
3034
<system:String x:Key="ignoreHotkeysOnFullscreen">전체화면 모드에서는 핫키 무시</system:String>
35+
<system:String x:Key="ignoreHotkeysOnFullscreenToolTip">게이머라면 켜는 것을 추천합니다.</system:String>
3136
<system:String x:Key="pythonDirectory">Python 디렉토리</system:String>
3237
<system:String x:Key="autoUpdates">자동 업데이트</system:String>
38+
<system:String x:Key="autoHideScrollBar">설정 창 스크롤바 숨기기</system:String>
39+
<system:String x:Key="autoHideScrollBarToolTip">설정 창 스크롤바가 작다면 끄는 것을 추천합니다.</system:String>
3340
<system:String x:Key="selectPythonDirectory">선택</system:String>
3441
<system:String x:Key="hideOnStartup">시작 시 Flow Launcher 숨김</system:String>
42+
<system:String x:Key="hideNotifyIcon">트레이 아이콘 숨기기</system:String>
43+
<system:String x:Key="querySearchPrecision">쿼리 검색 정확도</system:String>
44+
<system:String x:Key="querySearchPrecisionToolTip">검색 결과가 좀 더 정확해집니다.</system:String>
45+
<system:String x:Key="ShouldUsePinyin">항상 Pinyin 사용</system:String>
46+
<system:String x:Key="ShouldUsePinyinToolTip">Pinyin을 사용하여 검색할 수 있습니다. Pinyin(병음)은 로마자 중국어 입력 방식입니다.</system:String>
47+
<system:String x:Key="shadowEffectNotAllowed">반투명 흐림 효과를 사용하는 경우, 그림자 효과를 쓸 수 없습니다.</system:String>
3548

3649
<!--Setting Plugin-->
3750
<system:String x:Key="plugin">플러그인</system:String>
3851
<system:String x:Key="browserMorePlugins">플러그인 더 찾아보기</system:String>
39-
<system:String x:Key="disable">비활성화</system:String>
52+
<system:String x:Key="enable">On</system:String>
53+
<system:String x:Key="disable">Off</system:String>
4054
<system:String x:Key="actionKeywords">액션 키워드</system:String>
55+
<system:String x:Key="currentPriority">현재 중요도:</system:String>
56+
<system:String x:Key="newPriority">새 중요도:</system:String>
57+
<system:String x:Key="priority">중요도</system:String>
4158
<system:String x:Key="pluginDirectory">플러그인 디렉토리</system:String>
4259
<system:String x:Key="author">저자</system:String>
4360
<system:String x:Key="plugin_init_time">초기화 시간:</system:String>
4461
<system:String x:Key="plugin_query_time">쿼리 시간:</system:String>
62+
63+
64+
<!--Setting Plugin Store-->
65+
<system:String x:Key="pluginStore">플러그인 스토어</system:String>
66+
<system:String x:Key="refresh">새로고침</system:String>
67+
<system:String x:Key="install">설치</system:String>
68+
4569

4670
<!--Setting Theme-->
4771
<system:String x:Key="theme">테마</system:String>
4872
<system:String x:Key="browserMoreThemes">테마 더 찾아보기</system:String>
73+
<system:String x:Key="hiThere">Hi There</system:String>
4974
<system:String x:Key="queryBoxFont">쿼리 상자 글꼴</system:String>
5075
<system:String x:Key="resultItemFont">결과 항목 글꼴</system:String>
5176
<system:String x:Key="windowMode">윈도우 모드</system:String>
5277
<system:String x:Key="opacity">투명도</system:String>
78+
<system:String x:Key="theme_load_failure_path_not_exists">{0} 테마가 존재하지 않습니다. 기본 테마로 변경합니다.</system:String>
79+
<system:String x:Key="theme_load_failure_parse_error">{0} 테마 로드에 실패했습니다. 기본 테마로 변경합니다.</system:String>
80+
<system:String x:Key="ThemeFolder">테마 폴더</system:String>
81+
<system:String x:Key="OpenThemeFolder">테마 폴더 열기</system:String>
5382

5483
<!--Setting Hotkey-->
5584
<system:String x:Key="hotkey">핫키</system:String>
5685
<system:String x:Key="flowlauncherHotkey">Flow Launcher 핫키</system:String>
57-
<system:String x:Key="openResultModifiers">결과 수정 자 열기</system:String>
58-
<system:String x:Key="customQueryHotkey">사용자지정 쿼리 핫키</system:String>
86+
<system:String x:Key="flowlauncherHotkeyToolTip">Flow Launcher를 열 때 사용할 단축키를 입력합니다.</system:String>
87+
<system:String x:Key="openResultModifiers">결과 선택 단축키</system:String>
88+
<system:String x:Key="openResultModifiersToolTip">결과 목록을 선택하는 단축키입니다.</system:String>
5989
<system:String x:Key="showOpenResultHotkey">단축키 표시</system:String>
90+
<system:String x:Key="showOpenResultHotkeyToolTip">결과창에서 결과 선택 단축키를 표시합니다.</system:String>
91+
<system:String x:Key="customQueryHotkey">사용자지정 쿼리 핫키</system:String>
92+
<system:String x:Key="customQuery">Query</system:String>
6093
<system:String x:Key="delete">삭제</system:String>
6194
<system:String x:Key="edit">편집</system:String>
6295
<system:String x:Key="add">추가</system:String>
6396
<system:String x:Key="pleaseSelectAnItem">항목을 선택하세요.</system:String>
6497
<system:String x:Key="deleteCustomHotkeyWarning">{0} 플러그인 핫키를 삭제하시겠습니까?</system:String>
98+
<system:String x:Key="queryWindowShadowEffect">그림자 효과</system:String>
99+
<system:String x:Key="shadowEffectCPUUsage">그림자 효과는 GPU를 사용합니다. 컴퓨터 퍼포먼스가 제한적인 경우 사용을 추천하지 않습니다.</system:String>
100+
<system:String x:Key="useGlyphUI">플루언트 아이콘 사용</system:String>
101+
<system:String x:Key="useGlyphUIEffect">결과 및 일부 메뉴에서 플루언트 아이콘을 사용합니다.</system:String>
65102

66103
<!--Setting Proxy-->
67104
<system:String x:Key="proxy">HTTP 프록시</system:String>
@@ -86,8 +123,18 @@
86123
<system:String x:Key="about_activate_times">Flow Launcher를 {0}번 실행했습니다.</system:String>
87124
<system:String x:Key="checkUpdates">업데이트 확인</system:String>
88125
<system:String x:Key="newVersionTips">새 버전({0})이 있습니다. Flow Launcher를 재시작하세요.</system:String>
126+
<system:String x:Key="checkUpdatesFailed">업데이트 확인을 실패했습니다. api.github.com로의 연결 또는 프록시 설정을 확인해주세요.</system:String>
127+
<system:String x:Key="downloadUpdatesFailed">
128+
업데이트 다운로드에 실패했습니다. github-cloud.s3.amazonaws.com의 연결 또는 프록시 설정을 확인해주세요.
129+
수동 다운로드를 하려면 https://github.com/Flow-Launcher/Flow.Launcher/releases 으로 방문하세요.
130+
</system:String>
89131
<system:String x:Key="releaseNotes">릴리즈 노트:</system:String>
132+
<system:String x:Key="documentation">사용 팁:</system:String>
90133

134+
<!--Priority Setting Dialog-->
135+
<system:String x:Key="changePriorityWindow">중요도 변경</system:String>
136+
<system:String x:Key="priority_tips">높은 수를 넣을수록 상위 결과에 표시됩니다. 5를 시도해보세요. 다른 플러그인 보다 결과를 낮추고 싶다면, 그보다 낮은 수를 입력하세요.</system:String>
137+
<system:String x:Key="invalidPriority">중요도에 올바른 정수를 입력하세요.</system:String>
91138
<!--Action Keyword Setting Dialog-->
92139
<system:String x:Key="oldActionKeywords">예전 액션 키워드</system:String>
93140
<system:String x:Key="newActionKeywords">새 액션 키워드</system:String>
@@ -97,9 +144,11 @@
97144
<system:String x:Key="newActionKeywordsCannotBeEmpty">새 액션 키워드를 입력하세요.</system:String>
98145
<system:String x:Key="newActionKeywordsHasBeenAssigned">새 액션 키워드가 할당된 플러그인이 이미 있습니다. 다른 액션 키워드를 입력하세요.</system:String>
99146
<system:String x:Key="success">성공</system:String>
147+
<system:String x:Key="completedSuccessfully">성공적으로 완료했습니다.</system:String>
100148
<system:String x:Key="actionkeyword_tips">액션 키워드를 지정하지 않으려면 *를 사용하세요.</system:String>
101149

102150
<!--Custom Query Hotkey Dialog-->
151+
<system:String x:Key="customeQueryHotkeyTitle">커스텀 플러그인 핫키</system:String>
103152
<system:String x:Key="preview">미리보기</system:String>
104153
<system:String x:Key="hotkeyIsNotUnavailable">핫키를 사용할 수 없습니다. 다른 핫키를 입력하세요.</system:String>
105154
<system:String x:Key="invalidPluginHotkey">플러그인 핫키가 유효하지 않습니다.</system:String>
@@ -123,12 +172,23 @@
123172
<system:String x:Key="reportWindow_report_succeed">보고서를 정상적으로 보냈습니다.</system:String>
124173
<system:String x:Key="reportWindow_report_failed">보고서를 보내지 못했습니다.</system:String>
125174
<system:String x:Key="reportWindow_flowlauncher_got_an_error">Flow Launcher에 문제가 발생했습니다.</system:String>
126-
175+
176+
<!--General Notice-->
177+
<system:String x:Key="pleaseWait">잠시 기다려주세요...</system:String>
127178
<!--update-->
179+
<system:String x:Key="update_flowlauncher_update_check">새 업데이트 확인 중</system:String>
128180
<system:String x:Key="update_flowlauncher_update_new_version_available">새 Flow Launcher 버전({0})을 사용할 수 있습니다.</system:String>
181+
<system:String x:Key="update_flowlauncher_already_on_latest">이미 가장 최신 버전의 Flow Launcher를 사용중입니다.</system:String>
182+
<system:String x:Key="update_flowlauncher_update_found">업데이트 발견</system:String>
183+
<system:String x:Key="update_flowlauncher_updating">업데이트 중...</system:String>
184+
<system:String x:Key="update_flowlauncher_fail_moving_portable_user_profile_data">Flow Launcher가 유저 정보 데이터를 새버전으로 옮길 수 없습니다.
185+
프로필 데이터 폴더를 수동으로 {0} 에서 {1}로 옮겨주세요. </system:String>
186+
<system:String x:Key="update_flowlauncher_new_update">새 업데이트</system:String>
129187
<system:String x:Key="update_flowlauncher_update_error">소프트웨어 업데이트를 설치하는 중에 오류가 발생했습니다.</system:String>
130188
<system:String x:Key="update_flowlauncher_update">업데이트</system:String>
131189
<system:String x:Key="update_flowlauncher_update_cancel">취소</system:String>
190+
<system:String x:Key="update_flowlauncher_fail">업데이트 실패</system:String>
191+
<system:String x:Key="update_flowlauncher_check_connection">Check your connection and try updating proxy settings to github-cloud.s3.amazonaws.com.</system:String>
132192
<system:String x:Key="update_flowlauncher_update_restart_flowlauncher_tip">업데이트를 위해 Flow Launcher를 재시작합니다.</system:String>
133193
<system:String x:Key="update_flowlauncher_update_upadte_files">아래 파일들이 업데이트됩니다.</system:String>
134194
<system:String x:Key="update_flowlauncher_update_files">업데이트 파일</system:String>

Flow.Launcher/MainWindow.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
<MenuItem Command="ApplicationCommands.Paste"/>
9393
<Separator />
9494
<MenuItem Header="{DynamicResource flowlauncher_settings}" Click="OnContextMenusForSettingsClick" />
95-
<MenuItem Command="{Binding EscCommand}" Header="Close"/>
95+
<MenuItem Command="{Binding EscCommand}" Header="{DynamicResource closeWindow}"/>
9696
</ContextMenu>
9797
</TextBox.ContextMenu>
9898
</TextBox>

0 commit comments

Comments
 (0)