Skip to content

Commit

Permalink
更新到2018.1
Browse files Browse the repository at this point in the history
  • Loading branch information
ewen0930 committed Apr 3, 2018
1 parent ba546f7 commit c2a42ce
Show file tree
Hide file tree
Showing 576 changed files with 2,529 additions and 1,427 deletions.
2 changes: 1 addition & 1 deletion resources_en/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Manifest-Version: 1.0
Ant-Version: Apache Ant 1.9.4
Created-By: 1.8.0_152-release-1024-b11 (JetBrains s.r.o)
Created-By: 1.8.0_152-release-1136-b20 (JetBrains s.r.o)

44 changes: 27 additions & 17 deletions resources_en/com/intellij/dvcs/ui/DvcsBundle.properties
Original file line number Diff line number Diff line change
@@ -1,24 +1,34 @@
clone.button=Clone
clone.destination.directory.description=Select a parent directory for the clone
clone.destination.directory.title=Parent Directory
clone.destination.exists.error=The directory {0} already exists. Please choose another directory.
clone.dir.name=Directory &Name:
clone.invalid.url=Repository URL is a malformed URL or non-existent directory.
clone.parent.dir=&Parent Directory:
clone.parent.missing.error=The parent path {0} must exist.
clone.repository.url={0} Repository URL:
clone.test.failed.error=Repository test has failed.
clone.test.success.message=<html>Connection to {0} was established successfully.</html>
clone.test.connection.title=Test Connection
clone.test=&Test
clone.testing=Testing {0}
clone.title=Clone Repository
clone.url.is.not.directory.error=Repository URL is not a directory.
clone.button=Clone
clone.destination.directory.label=Directory:
clone.destination.directory.browser.title=Destination Directory
clone.destination.directory.browser.description=Select a parent directory for the clone
clone.destination.directory.error.not.directory=Destination is not a directory
clone.destination.directory.error.invalid=Invalid directory path
clone.destination.directory.error.exists=The directory already exists and it is not empty
clone.destination.directory.error.access=Couldn't create destination directory<br/>Check your access rights
clone.repository.url.label=URL:
clone.repository.url.error.invalid=Repository URL is a malformed URL or non-existent directory
clone.repository.url.error.empty=Empty repository URL
clone.repository.url.error.not.directory=Repository URL is not a directory
clone.repository.url.test.label=Test
clone.repository.url.test.title=Testing {0}
clone.repository.url.test.success.message=Connection successful
clone.repository.url.test.failed.message=Repository test failed<br/>{0}
clone.repository.url.autocomplete.hint={0} repositories completion available ( {1} )
clone.repository.url.autocomplete.login.text=Log in to {0}...
clone.repository.url.autocomplete.login.tooltip=Log in to see your repositories in the URL list
cloning.repository=Cloning source repository {0}
commit.amend=Amend commit
commit.amend.tooltip=<html>Merge this commit with the previous one</html>
push.force.confirmation.text = You''re going to force push{0}. It may overwrite commits at the remote. Are you sure you want to proceed?

push.force.confirmation.text=You''re going to force push{0}. It may overwrite commits at the remote. Are you sure you want to proceed?
sync.setting=Execute branch operations on all roots
sync.setting.description=If selected, you would be able to checkout, compare, delete and create new branches in all {0} \
roots with a single action. It will also affect behavior of the push dialog.
executable.path.project.override=Set this path only for current project
# poor naming, remove when there's no external usages
clone.test.success.message=Connection successful
clone.destination.exists.error=The directory {0} already exists. Please choose another directory.
clone.parent.dir=&Parent Directory:
clone.parent.missing.error=The parent path {0} must exist.
clone.testing=Testing {0}
46 changes: 28 additions & 18 deletions resources_en/com/intellij/dvcs/ui/DvcsBundle_zh_CN.properties
Original file line number Diff line number Diff line change
@@ -1,23 +1,33 @@
clone.title=\u514b\u9686\u4ed3\u5e93
clone.button=\u514b\u9686
clone.destination.directory.description=\u9009\u62e9\u514b\u9686\u7684\u7236\u76ee\u5f55
clone.destination.directory.title=\u7236\u76ee\u5f55
clone.destination.exists.error=\u76ee\u5f55{0}\u5df2\u7ecf\u5b58\u5728\u3002\u8bf7\u9009\u62e9\u53e6\u4e00\u4e2a\u76ee\u5f55\u3002
clone.dir.name=\u76ee\u5f55\u540d\u79f0(&N):
clone.invalid.url=\u5b58\u50a8\u5e93URL\u662f\u683c\u5f0f\u4e0d\u6b63\u786e\u7684URL\u6216\u4e0d\u5b58\u5728\u7684\u76ee\u5f55\u3002
clone.parent.dir=\u7236\u76ee\u5f55(&P):
clone.parent.missing.error=\u7236\u8def\u5f84{0}\u5fc5\u987b\u5b58\u5728\u3002
clone.repository.url={0}\u8d44\u6599\u5e93\u7f51\u5740:
clone.test.failed.error=\u7248\u672c\u5e93\u6d4b\u8bd5\u5931\u8d25\u3002
clone.test.success.message=<html>\u4e0e{0}\u7684\u8fde\u63a5\u5df2\u6210\u529f\u5efa\u7acb\u3002</html>
clone.test.connection.title=\u6d4b\u8bd5\u8fde\u63a5
clone.test=\u6d4b\u8bd5(&T)
clone.testing=\u6d4b\u8bd5{0}
clone.title=\u514b\u9686\u5b58\u50a8\u5e93
clone.url.is.not.directory.error=\u5b58\u50a8\u5e93URL\u4e0d\u662f\u4e00\u4e2a\u76ee\u5f55\u3002
cloning.repository=\u514b\u9686\u6e90\u5b58\u50a8\u5e93{0}
clone.destination.directory.label=\u76ee\u5f55:
clone.destination.directory.browser.title=\u76ee\u6807\u76ee\u5f55
clone.destination.directory.browser.description=\u9009\u62e9\u7236\u76ee\u5f55\u514b\u9686
clone.destination.directory.error.not.directory=\u76ee\u7684\u5730\u5740\u4e0d\u662f\u4e00\u4e2a\u76ee\u5f55
clone.destination.directory.error.invalid=\u65e0\u6548\u7684\u76ee\u5f55\u8def\u5f84
clone.destination.directory.error.exists=\u76ee\u5f55\u5df2\u7ecf\u5b58\u5728\uff0c\u4f46\u4e0d\u662f\u7a7a\u7684
clone.destination.directory.error.access=\u65e0\u6cd5\u521b\u5efa\u76ee\u6807\u76ee\u5f55<br/>\u68c0\u67e5\u4f60\u7684\u8bbf\u95ee\u6743\u9650
clone.repository.url.label=URL:
clone.repository.url.error.invalid=\u5b58\u50a8\u5e93URL\u662f\u4e00\u4e2a\u9519\u8bef\u7684URL\u6216\u4e0d\u5b58\u5728\u7684\u76ee\u5f55
clone.repository.url.error.empty=\u7a7a\u7684\u4ed3\u5e93URL
clone.repository.url.error.not.directory=\u4ed3\u5e93URL\u4e0d\u662f\u76ee\u5f55
clone.repository.url.test.label=\u6d4b\u8bd5
clone.repository.url.test.title=\u6d4b\u8bd5 {0}
clone.repository.url.test.success.message=\u8fde\u63a5\u6210\u529f
clone.repository.url.test.failed.message=\u4ed3\u5e93\u6d4b\u8bd5\u5931\u8d25<br/>{0}
clone.repository.url.autocomplete.hint={0} repositories completion available ( {1} )
clone.repository.url.autocomplete.login.text=\u767b\u5f55\u5230 {0}...
clone.repository.url.autocomplete.login.tooltip=\u767b\u5f55\u5230URL\u5217\u8868\u4e2d\u67e5\u770b\u4f60\u7684\u4ed3\u5e93
cloning.repository=\u514b\u9686\u6e90\u4ed3\u5e93{0}
commit.amend=\u4fee\u6539\u63d0\u4ea4
commit.amend.tooltip=<html>\u5c06\u6b64\u63d0\u4ea4\u4e0e\u524d\u4e00\u4e2a</html>\u5408\u5e76
push.force.confirmation.text = \u60a8\u5c06\u5f3a\u5236\u63a8\u9001{0}\u3002\u5b83\u53ef\u80fd\u4f1a\u8986\u76d6\u8fdc\u7a0b\u7684\u63d0\u4ea4\u3002\u4f60\u786e\u5b9a\u8981\u7ee7\u7eed\u5417\uff1f

push.force.confirmation.text=\u60a8\u5c06\u5f3a\u5236\u63a8\u9001{0}\u3002\u5b83\u53ef\u80fd\u4f1a\u8986\u76d6\u8fdc\u7a0b\u7684\u63d0\u4ea4\u3002\u4f60\u786e\u5b9a\u8981\u7ee7\u7eed\u5417\uff1f
sync.setting=\u5728\u6240\u6709\u6839\u4e0a\u6267\u884c\u5206\u652f\u64cd\u4f5c
sync.setting.description=\u5982\u679c\u9009\u4e2d\uff0c\u60a8\u5c06\u53ef\u4ee5\u901a\u8fc7\u4e00\u4e2a\u64cd\u4f5c\u68c0\u51fa\uff0c\u6bd4\u8f83\uff0c\u5220\u9664\u548c\u521b\u5efa\u6240\u6709{0}\u6839\u76ee\u5f55\u4e2d\u7684\u65b0\u5206\u652f\u3002\u8fd9\u4e5f\u4f1a\u5f71\u54cd\u63a8\u9001\u5bf9\u8bdd\u6846\u7684\u884c\u4e3a\u3002
executable.path.project.override=\u8bbe\u7f6e\u6b64\u8def\u5f84\u4e3a\u5f53\u524d\u9879\u76ee
# poor naming, remove when there's no external usages
clone.test.success.message=\u8fde\u63a5\u6210\u529f
clone.destination.exists.error=\u76ee\u5f55{0}\u5df2\u7ecf\u5b58\u5728\u3002\u8bf7\u9009\u62e9\u53e6\u4e00\u4e2a\u76ee\u5f55\u3002
clone.parent.dir=\u7236\u76ee\u5f55(&P):
clone.parent.missing.error=\u7236\u8def\u5f84{0}\u5fc5\u987b\u5b58\u5728\u3002
clone.testing=\u6d4b\u8bd5{0}
46 changes: 28 additions & 18 deletions resources_en/com/intellij/dvcs/ui/DvcsBundle_zh_TW.properties
Original file line number Diff line number Diff line change
@@ -1,23 +1,33 @@
clone.title=\u514b\u9686\u5009\u5eab
clone.button=\u514b\u9686
clone.destination.directory.description=\u9078\u53d6\u514b\u9686\u7684\u7236\u76ee\u9304
clone.destination.directory.title=\u7236\u76ee\u9304
clone.destination.exists.error=\u76ee\u9304{0}\u5df2\u7d93\u5b58\u5728\u3002\u8acb\u9078\u53d6\u53e6\u4e00\u500b\u76ee\u9304\u3002
clone.dir.name=\u76ee\u9304\u540d\u7a31(&N):
clone.invalid.url=\u5b58\u5132\u5eabURL\u662f\u683c\u5f0f\u4e0d\u6b63\u78ba\u7684URL\u6216\u4e0d\u5b58\u5728\u7684\u76ee\u9304\u3002
clone.parent.dir=\u7236\u76ee\u9304(&P):
clone.parent.missing.error=\u7236\u8def\u5f91{0}\u5fc5\u9808\u5b58\u5728\u3002
clone.repository.url={0}\u8cc7\u6599\u5eab\u7db2\u5740:
clone.test.failed.error=\u7248\u672c\u5eab\u6e2c\u8a66\u5931\u6557\u3002
clone.test.success.message=<html>\u8207{0}\u7684\u9023\u63a5\u5df2\u6210\u529f\u5efa\u7acb\u3002</html>
clone.test.connection.title=\u6e2c\u8a66\u9023\u63a5
clone.test=\u6e2c\u8a66(&T)
clone.testing=\u6e2c\u8a66{0}
clone.title=\u514b\u9686\u5b58\u5132\u5eab
clone.url.is.not.directory.error=\u5b58\u5132\u5eabURL\u4e0d\u662f\u4e00\u500b\u76ee\u9304\u3002
cloning.repository=\u514b\u9686\u6e90\u5b58\u5132\u5eab{0}
clone.destination.directory.label=\u76ee\u9304:
clone.destination.directory.browser.title=\u76ee\u6a19\u76ee\u9304
clone.destination.directory.browser.description=\u9078\u53d6\u7236\u76ee\u9304\u514b\u9686
clone.destination.directory.error.not.directory=\u76ee\u7684\u4f4d\u5740\u4e0d\u662f\u4e00\u500b\u76ee\u9304
clone.destination.directory.error.invalid=\u7121\u6548\u7684\u76ee\u9304\u8def\u5f91
clone.destination.directory.error.exists=\u76ee\u9304\u5df2\u7d93\u5b58\u5728\uff0c\u4f46\u4e0d\u662f\u7a7a\u7684
clone.destination.directory.error.access=\u7121\u6cd5\u5efa\u7acb\u76ee\u6a19\u76ee\u9304<br/>\u6aa2\u67e5\u4f60\u7684\u5b58\u53d6\u6b0a\u9650
clone.repository.url.label=URL:
clone.repository.url.error.invalid=\u5b58\u5132\u5eabURL\u662f\u4e00\u500b\u932f\u8aa4\u7684URL\u6216\u4e0d\u5b58\u5728\u7684\u76ee\u9304
clone.repository.url.error.empty=\u7a7a\u7684\u5009\u5eabURL
clone.repository.url.error.not.directory=\u5009\u5eabURL\u4e0d\u662f\u76ee\u9304
clone.repository.url.test.label=\u6e2c\u8a66
clone.repository.url.test.title=\u6e2c\u8a66 {0}
clone.repository.url.test.success.message=\u9023\u63a5\u6210\u529f
clone.repository.url.test.failed.message=\u5009\u5eab\u6e2c\u8a66\u5931\u6557<br/>{0}
clone.repository.url.autocomplete.hint={0} repositories completion available ( {1} )
clone.repository.url.autocomplete.login.text=\u767b\u5165\u5230 {0}...
clone.repository.url.autocomplete.login.tooltip=\u767b\u5165\u5230URL\u6e05\u55ae\u4e2d\u6aa2\u8996\u4f60\u7684\u5009\u5eab
cloning.repository=\u514b\u9686\u6e90\u5009\u5eab{0}
commit.amend=\u4fee\u6539\u63d0\u4ea4
commit.amend.tooltip=<html>\u5c07\u6b64\u63d0\u4ea4\u8207\u524d\u4e00\u500b</html>\u5408\u4f75
push.force.confirmation.text = \u60a8\u5c07\u5f37\u5236\u63a8\u9001{0}\u3002\u5b83\u53ef\u80fd\u6703\u8986\u5beb\u9060\u7aef\u7684\u63d0\u4ea4\u3002\u4f60\u78ba\u5b9a\u8981\u7e7c\u7e8c\u55ce\uff1f

push.force.confirmation.text=\u60a8\u5c07\u5f37\u5236\u63a8\u9001{0}\u3002\u5b83\u53ef\u80fd\u6703\u8986\u5beb\u9060\u7aef\u7684\u63d0\u4ea4\u3002\u4f60\u78ba\u5b9a\u8981\u7e7c\u7e8c\u55ce\uff1f
sync.setting=\u5728\u6240\u6709\u6839\u4e0a\u57f7\u884c\u5206\u652f\u64cd\u4f5c
sync.setting.description=\u5982\u679c\u9078\u53d6\uff0c\u60a8\u5c07\u53ef\u4ee5\u900f\u904e\u4e00\u500b\u64cd\u4f5c\u6aa2\u51fa\uff0c\u6bd4\u8f03\uff0c\u522a\u9664\u548c\u5efa\u7acb\u6240\u6709{0}\u6839\u76ee\u9304\u4e2d\u7684\u65b0\u5206\u652f\u3002\u9019\u4e5f\u6703\u5f71\u97ff\u63a8\u9001\u5c0d\u8a71\u65b9\u584a\u7684\u884c\u70ba\u3002
executable.path.project.override=\u8a2d\u5b9a\u6b64\u8def\u5f91\u70ba\u76ee\u524d\u9805\u76ee
# poor naming, remove when there's no external usages
clone.test.success.message=\u9023\u63a5\u6210\u529f
clone.destination.exists.error=\u76ee\u9304{0}\u5df2\u7d93\u5b58\u5728\u3002\u8acb\u9078\u53d6\u53e6\u4e00\u500b\u76ee\u9304\u3002
clone.parent.dir=\u7236\u76ee\u9304(&P):
clone.parent.missing.error=\u7236\u8def\u5f91{0}\u5fc5\u9808\u5b58\u5728\u3002
clone.testing=\u6e2c\u8a66{0}
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ spellchecking.inspection.name=Typo
typo.in.word.ref=Typo: In word '#ref'
add.0.to.dictionary=Typo: Save ''{0}'' to dictionary
add.to.dictionary=Save to dictionary
save.0.to.1=Save {0} to {1}
0.in.qoutes=''{0}''
class.name.with.mistakes=Class name with mistakes
method.name.with.mistakes=Method name with mistakes
field.name.with.mistakes=Field name with mistakes
Expand All @@ -25,12 +27,35 @@ process.comments=Process comments
link.to.settings=Manage Dictionaries
link.to.inspection.settings=Configure 'Spelling' inspection
exact.rename.to=Typo: Rename to ''{0}''
add.directory.title=Custom Dictionaries Folder
add.directory.description=Add folders to load dictionaries (plaintext word lists) from
directory.is.already.included=Directory is already included
dictionaries.panel.title=Dictionaries
dictionaries.panel.description=Enable/disable dictionaries for your project

custom.dictionaries.title=Custom Dictionaries
add.dictionary.description=Add custom dictionaries: plaintext word lists
hunspell.description=hunspell dictionaries
bundled.dictionaries.title=Bundled Dictionaries
dictionaries.panel.description=Enable/disable bundled dictionaries for your project
custom.dictionary.title=Custom Dictionary
add.custom.dictionaries=Add custom dictionaries
edit.custom.dictionary=Edit custom dictionary
custom.dictionary.not.found.title=Custom Dictionary Is not Found
custom.dictionary.not.found=Custom dictionary is not found at path {0}
dictionary.not.found.title=Dictionary is not Found
dictionary.not.found=Dictionary is not found at path {0}
remove.custom.dictionaries=Remove custom dictionaries
no.words=No additional words
no.custom.folders=No custom folders
no.custom.dictionaries=No custom dictionaries
no.dictionaries=No dictionaries found
dictionary.filetype.name=Dictionary
dictionary.filetype.description=Dictionary file
spellchecker=Spellchecker
changed.dict.title={0} dictionary is changed
new.word.description=''{0}'' is added to {1} dictionary
revert.action.title=Revert
show.changes.action.title=Open dictionary
user.dictionaries.title=User Dictionaries
project.dictionary=Project-level dictionary
app.dictionary=Application-level dictionary
built.in.dictionary=built-in
words.list.dictionary=word list
select.dictionary.title=Select dictionary
max.number.of.corrections=Max number of corrections
use.single.dictionary=Use single dictionary for words saving
advanced.settings=Advanced settings
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ spellchecking.inspection.name=\u9519\u5b57
typo.in.word.ref=\u9519\u5b57\uff1a\u7528\u201c#ref\u201d
add.0.to.dictionary=\u9519\u5b57\uff1a\u5c06\u201c{0}\u201d\u4fdd\u5b58\u4e3a\u5b57\u5178
add.to.dictionary=\u4fdd\u5b58\u5230\u5b57\u5178
save.0.to.1=\u4fdd\u5b58 {0} \u5230 {1}
0.in.qoutes=''{0}''
class.name.with.mistakes=\u6709\u9519\u8bef\u7684\u7c7b\u540d
method.name.with.mistakes=\u65b9\u6cd5\u540d\u79f0\u4e0e\u9519\u8bef
field.name.with.mistakes=\u5b57\u6bb5\u540d\u79f0\u4e0e\u9519\u8bef
Expand All @@ -25,12 +27,35 @@ process.comments=\u5904\u7406\u8bc4\u8bba
link.to.settings=\u7ba1\u7406\u5b57\u5178
link.to.inspection.settings=\u914d\u7f6e\u201c\u62fc\u5199\u68c0\u67e5\u201d
exact.rename.to=\u9519\u5b57\uff1a\u91cd\u547d\u540d\u4e3a\u201c{0}\u201d
add.directory.title=\u81ea\u5b9a\u4e49\u5b57\u5178\u6587\u4ef6\u5939
add.directory.description=\u6dfb\u52a0\u6587\u4ef6\u5939\u6765\u52a0\u8f7d\u5b57\u5178(\u660e\u6587\u5355\u8bcd\u5217\u8868\uff09
directory.is.already.included=\u76ee\u5f55\u5df2\u7ecf\u5305\u542b\u5728\u5185
dictionaries.panel.title=\u5b57\u5178
dictionaries.panel.description=\u542f\u7528/\u7981\u7528\u60a8\u7684\u9879\u76ee\u7684\u5b57\u5178

no.words=\u6ca1\u6709\u989d\u5916\u7684\u8bdd\u8bed
no.custom.folders=\u6ca1\u6709\u81ea\u5b9a\u4e49\u6587\u4ef6\u5939
custom.dictionaries.title=\u81ea\u5b9a\u4e49\u8bcd\u5178
add.dictionary.description=\u6dfb\u52a0\u81ea\u5b9a\u4e49\u5b57\u5178\uff1a\u660e\u6587\u5355\u8bcd\u5217\u8868
hunspell.description=hunspell dictionaries
bundled.dictionaries.title=Bundled Dictionaries
dictionaries.panel.description=\u542f\u7528/\u7981\u7528\u60a8\u7684\u9879\u76ee\u5b57\u5178
custom.dictionary.title=\u81ea\u5b9a\u4e49\u8bcd\u5178
add.custom.dictionaries=\u6dfb\u52a0\u81ea\u5b9a\u4e49\u5b57\u5178
edit.custom.dictionary=\u7f16\u8f91\u81ea\u5b9a\u4e49\u5b57\u5178
custom.dictionary.not.found.title=\u6ca1\u6709\u627e\u5230\u81ea\u5b9a\u4e49\u5b57\u5178
custom.dictionary.not.found=Custom dictionary is not found at path {0}
dictionary.not.found.title=\u5b57\u5178\u6ca1\u6709\u627e\u5230
dictionary.not.found=\u5728\u8def\u5f84 {0} \u4e2d\u627e\u4e0d\u5230\u5b57\u5178
remove.custom.dictionaries=\u5220\u9664\u81ea\u5b9a\u4e49\u5b57\u5178
no.words=\u6ca1\u6709\u989d\u5916\u7684\u5355\u8bcd
no.custom.dictionaries=\u6ca1\u6709\u81ea\u5b9a\u4e49\u8bcd\u5178
no.dictionaries=\u6ca1\u6709\u5b57\u5178\u53d1\u73b0
dictionary.filetype.name=\u5b57\u5178
dictionary.filetype.description=\u5b57\u5178\u6587\u4ef6
spellchecker=\u62fc\u5199\u68c0\u67e5
changed.dict.title={0} \u5b57\u5178\u5df2\u7ecf\u6539\u53d8
new.word.description=''{0}'' \u6dfb\u52a0\u5230\u5b57\u5178 {1}
revert.action.title=\u56de\u590d
show.changes.action.title=\u6253\u5f00\u5b57\u5178
user.dictionaries.title=\u7528\u6237\u8bcd\u5178
project.dictionary=\u9879\u76ee\u7ea7\u5b57\u5178
app.dictionary=\u5e94\u7528\u7ea7\u5b57\u5178
built.in.dictionary=\u5185\u7f6e\u7684
words.list.dictionary=\u5355\u8bcd\u5217\u8868
select.dictionary.title=\u9009\u62e9\u5b57\u5178
max.number.of.corrections=\u6700\u5927\u6570\u91cf\u7684\u4fee\u6b63
use.single.dictionary=\u4f7f\u7528\u5355\u4e00\u5b57\u5178\u6765\u4fdd\u5b58\u5355\u8bcd
advanced.settings=\u9ad8\u7ea7\u8bbe\u7f6e
Loading

0 comments on commit c2a42ce

Please sign in to comment.