comparison i18n/ja.po @ 30542:64b55bffc1c0

merge with stable
author Augie Fackler <augie@google.com>
date Sun, 27 Nov 2016 20:44:52 -0500
parents 318a24b52eeb 819f96b82fa4
children 13d94304c8da
comparison
equal deleted inserted replaced
30541:342d0cb4f446 30542:64b55bffc1c0
10462 " 対象が無指定の場合、 『変更なし』以外の全ての管理対象ファイルが、\n" 10462 " 対象が無指定の場合、 『変更なし』以外の全ての管理対象ファイルが、\n"
10463 " 変更退避の対象になります。 対象ファイル/ディレクトリ指定がある場合、\n" 10463 " 変更退避の対象になります。 対象ファイル/ディレクトリ指定がある場合、\n"
10464 " 指定対象の変更のみが退避されます。" 10464 " 指定対象の変更のみが退避されます。"
10465 10465
10466 msgid "" 10466 msgid ""
10467 " In bare shelve(when no files are specified, without interactive,\n" 10467 " In bare shelve (when no files are specified, without interactive,\n"
10468 " include and exclude option), shelving remembers information if the\n" 10468 " include and exclude option), shelving remembers information if the\n"
10469 " working directory was on newly created branch, in other words working\n" 10469 " working directory was on newly created branch, in other words working\n"
10470 " directory was on different branch than its first parent. In this\n" 10470 " directory was on different branch than its first parent. In this\n"
10471 " situation unshelving restores branch information to the working " 10471 " situation unshelving restores branch information to the working "
10472 "directory." 10472 "directory."