Skip to content

Update for 8.0.0727 #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 30, 2017
+28 −20
Merged

Update for 8.0.0727 #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7272096
Catch up with 8.0.0727
k-takata Jul 18, 2017
7da9fb1
Import cleanup.vim from Vim 8.0.0726
k-takata Jul 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,28 +44,21 @@ runtime/tutor/tutor |原文チュートリアルファイル

/fuzzy\|^msgstr ""\(\n"\)\@!

5. 使われなくなった翻訳の削除

使われなくなった翻訳が ja.po の末尾に `#~` を付けて記録されている。それを削
除する。以下のコマンドが使える。

:%s/^#\~/d

6. 不要な情報の削除
5. 不要な情報の削除

Vim で以下のようにする。

:source cleanup.vim

cleanup.vim は Vim 本体からのコピー

7. チェック
6. チェック

$ vim -S check.vim ja.po

`make check` でも代替可能。

8. もう1回マージして、整形と消しすぎたコメントの復活
7. もう1回マージして、整形と消しすぎたコメントの復活

$ make merge-force
$ vim ja.po
Expand Down
8 changes: 7 additions & 1 deletion src/po/cleanup.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,18 @@
let s:was_diff = &diff
setl nodiff

silent g/^#: /d
" untranslated message preceded by c-format or comment
silent g/^#, c-format\n#/.d
silent g/^#\..*\n#/.d

silent g/^#[:~] /d
silent g/^#, fuzzy\(, .*\)\=\nmsgid ""\@!/.+1,/^$/-1s/^/#\~ /
silent g/^msgstr"/s//msgstr "/
silent g/^msgid"/s//msgid "/
silent g/^msgstr ""\(\n"\)\@!/?^msgid?,.s/^/#\~ /

silent g/^\n\n\n/.d

if s:was_diff
setl diff
endif
27 changes: 18 additions & 9 deletions src/po/ja.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Vim 8.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-07-03 23:05+0900\n"
"POT-Creation-Date: 2017-07-18 20:29+0900\n"
"PO-Revision-Date: 2017-07-12 20:45+0900\n"
"Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
"Language-Team: vim-jp (https://github.com/vim-jp/lang-ja)\n"
Expand Down Expand Up @@ -3155,6 +3155,9 @@ msgstr "--startuptime <file>\t起動にかかった時間の詳細を <file> へ
msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
msgstr "-i <viminfo>\t\t.viminfoの代わりに <viminfo> を使う"

msgid "--clean\t\t'nocompatible', Vim defaults, no plugins, no viminfo"
msgstr "--clean\t\t'nocompatible'、Vimの既定、プラグインなし、viminfoなし"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

、 と , のどちらが良いでしょう？
ファイル内で結構混在していますが、, の方が多い？

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

どっちが良いというわけではないですが 、 の as is で良いんじゃないでしょうか?


msgid "-h or --help\tPrint Help (this message) and exit"
msgstr "-h or --help\tヘルプ(このメッセージ)を表示し終了する"

Expand Down Expand Up @@ -4139,19 +4142,25 @@ msgstr "%ld 行が変更されました"
msgid "freeing %ld lines"
msgstr "%ld 行を解放中"

msgid "block of 1 line yanked"
msgstr "1 行のブロックがヤンクされました"
#, c-format
msgid " into \"%c"
msgstr " \"%c に"

msgid "1 line yanked"
msgstr "1 行がヤンクされました"
#, c-format
msgid "block of 1 line yanked%s"
msgstr "1 行のブロックが%sヤンクされました"

#, c-format
msgid "1 line yanked%s"
msgstr "1 行が%sヤンクされました"

#, c-format
msgid "block of %ld lines yanked"
msgstr "%ld 行のブロックがヤンクされました"
msgid "block of %ld lines yanked%s"
msgstr "%ld 行のブロックが%sヤンクされました"

#, c-format
msgid "%ld lines yanked"
msgstr "%ld 行がヤンクされました"
msgid "%ld lines yanked%s"
msgstr "%ld 行が%sヤンクされました"

#, c-format
msgid "E353: Nothing in register %s"
Expand Down