Page Menu
Home
Phabricator (Chris)
Search
Configure Global Search
Log In
Files
F135147
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Flag For Later
Award Token
Authored By
Unknown
Size
107 KB
Referenced Files
None
Subscribers
None
View Options
diff --git a/Guitar_ja.qm b/Guitar_ja.qm
index 0296c51..8c93ad5 100644
Binary files a/Guitar_ja.qm and b/Guitar_ja.qm differ
diff --git a/Guitar_ja.ts b/Guitar_ja.ts
index 84fc199..b4f7cb2 100644
--- a/Guitar_ja.ts
+++ b/Guitar_ja.ts
@@ -1,1389 +1,2486 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="ja_JP">
<context>
<name>AboutDialog</name>
<message>
<location filename="src/AboutDialog.ui" line="14"/>
<source>Dialog</source>
<translation></translation>
</message>
<message>
<location filename="src/AboutDialog.ui" line="29"/>
<location filename="src/AboutDialog.ui" line="36"/>
<location filename="src/AboutDialog.ui" line="43"/>
<location filename="src/AboutDialog.ui" line="50"/>
<source>TextLabel</source>
<translation></translation>
</message>
<message>
- <location filename="src/AboutDialog.cpp" line="21"/>
<source>About Guitar</source>
- <translation>Guitarについて</translation>
+ <translation type="vanished">Guitarについて</translation>
+ </message>
+ <message>
+ <location filename="src/AboutDialog.cpp" line="28"/>
+ <source>About %1</source>
+ <translation>%1 について</translation>
+ </message>
+</context>
+<context>
+ <name>AreYouSureYouWantToContinueConnectingDialog</name>
+ <message>
+ <location filename="src/AreYouSureYouWantToContinueConnectingDialog.ui" line="14"/>
+ <source>Unknown Host</source>
+ <translation>不明なホスト</translation>
+ </message>
+ <message>
+ <location filename="src/AreYouSureYouWantToContinueConnectingDialog.ui" line="20"/>
+ <source>Are you sure you want to continue connecting (yes/no)?</source>
+ <translation>接続を続行しますか? (yes/no)</translation>
+ </message>
+ <message>
+ <location filename="src/AreYouSureYouWantToContinueConnectingDialog.ui" line="52"/>
+ <source>Continue</source>
+ <translation>続行</translation>
+ </message>
+ <message>
+ <location filename="src/AreYouSureYouWantToContinueConnectingDialog.ui" line="59"/>
+ <source>Close</source>
+ <translation>閉じる</translation>
</message>
</context>
<context>
<name>BasicRepositoryDialog</name>
<message>
- <location filename="src/BasicRepositoryDialog.cpp" line="58"/>
+ <location filename="src/BasicRepositoryDialog.cpp" line="66"/>
+ <source>Name</source>
+ <translation>名前</translation>
+ </message>
+ <message>
+ <location filename="src/BasicRepositoryDialog.cpp" line="67"/>
<source>Purpose</source>
<translation>用途</translation>
</message>
<message>
- <location filename="src/BasicRepositoryDialog.cpp" line="59"/>
<source>Remote</source>
- <translation>リモート</translation>
+ <translation type="vanished">リモート</translation>
</message>
<message>
- <location filename="src/BasicRepositoryDialog.cpp" line="60"/>
+ <location filename="src/BasicRepositoryDialog.cpp" line="68"/>
<source>URL</source>
<translation></translation>
</message>
</context>
<context>
<name>BigDiffWindow</name>
<message>
<location filename="src/BigDiffWindow.ui" line="14"/>
<source>Diff</source>
<translation>差分</translation>
</message>
</context>
+<context>
+ <name>BlameWindow</name>
+ <message>
+ <location filename="src/BlameWindow.ui" line="14"/>
+ <source>Blame</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="src/BlameWindow.ui" line="45"/>
+ <source>Information</source>
+ <translation>情報</translation>
+ </message>
+ <message>
+ <location filename="src/BlameWindow.ui" line="54"/>
+ <source>Commit</source>
+ <translation>コミット</translation>
+ </message>
+ <message>
+ <location filename="src/BlameWindow.ui" line="64"/>
+ <source>Date</source>
+ <translation>日付</translation>
+ </message>
+ <message>
+ <location filename="src/BlameWindow.ui" line="74"/>
+ <source>Message</source>
+ <translation>メッセージ</translation>
+ </message>
+ <message>
+ <location filename="src/BlameWindow.ui" line="84"/>
+ <source>Author</source>
+ <translation>名前</translation>
+ </message>
+ <message>
+ <location filename="src/BlameWindow.ui" line="112"/>
+ <source>Close</source>
+ <translation>閉じる</translation>
+ </message>
+</context>
<context>
<name>CheckoutBranchDialog</name>
<message>
<source>Checkout</source>
<translation type="vanished">チェックアウト</translation>
</message>
<message>
<source>Cancel</source>
<translation type="vanished">キャンセル</translation>
</message>
<message>
<source>Current branch :</source>
<translation type="vanished">現在のブランチ :</translation>
</message>
</context>
<context>
<name>CheckoutDialog</name>
<message>
<location filename="src/CheckoutDialog.ui" line="14"/>
<source>Checkout</source>
<translation>チェックアウト</translation>
</message>
<message>
<location filename="src/CheckoutDialog.ui" line="20"/>
<location filename="src/CheckoutDialog.ui" line="27"/>
<location filename="src/CheckoutDialog.ui" line="34"/>
<source>RadioButton</source>
<translation></translation>
</message>
<message>
<location filename="src/CheckoutDialog.ui" line="63"/>
<source>OK</source>
<translation></translation>
</message>
<message>
<location filename="src/CheckoutDialog.ui" line="70"/>
<source>Cancel</source>
<translation>キャンセル</translation>
</message>
</context>
<context>
<name>CloneDialog</name>
<message>
<location filename="src/CloneDialog.ui" line="14"/>
- <location filename="src/CloneDialog.ui" line="76"/>
+ <location filename="src/CloneDialog.ui" line="103"/>
<source>Clone</source>
<translation>クローン</translation>
</message>
<message>
<location filename="src/CloneDialog.ui" line="22"/>
<source>Remote</source>
<translation>リモート</translation>
</message>
<message>
<location filename="src/CloneDialog.ui" line="39"/>
<source>&Test</source>
<translation>テスト(&T)</translation>
</message>
<message>
<location filename="src/CloneDialog.ui" line="46"/>
<source>Local</source>
<translation>ローカル</translation>
</message>
<message>
- <location filename="src/CloneDialog.ui" line="86"/>
+ <location filename="src/CloneDialog.ui" line="56"/>
+ <source>Browse</source>
+ <translation>参照</translation>
+ </message>
+ <message>
+ <location filename="src/CloneDialog.ui" line="83"/>
+ <source>Open existing local directory...</source>
+ <translation>既存のフォルダを開く...</translation>
+ </message>
+ <message>
+ <location filename="src/CloneDialog.ui" line="113"/>
<source>Cancel</source>
<translation>キャンセル</translation>
</message>
<message>
- <location filename="src/CloneDialog.cpp" line="41"/>
+ <location filename="src/CloneDialog.cpp" line="40"/>
<source>Search</source>
<translation>検索</translation>
</message>
<message>
- <location filename="src/CloneDialog.cpp" line="42"/>
+ <location filename="src/CloneDialog.cpp" line="41"/>
<source>GitHub</source>
<translation></translation>
</message>
+ <message>
+ <location filename="src/CloneDialog.cpp" line="108"/>
+ <source>Checkout into</source>
+ <translation>ここにチェックアウト</translation>
+ </message>
+ <message>
+ <location filename="src/CloneDialog.cpp" line="120"/>
+ <source>Open existing directory</source>
+ <translation>既存のフォンるだを開く</translation>
+ </message>
+</context>
+<context>
+ <name>CommitDialog</name>
+ <message>
+ <location filename="src/CommitDialog.ui" line="14"/>
+ <source>Commit</source>
+ <translation>コミット</translation>
+ </message>
+ <message>
+ <location filename="src/CommitDialog.ui" line="27"/>
+ <source>TextLabel</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="src/CommitDialog.ui" line="43"/>
+ <source>Author</source>
+ <translation>名前</translation>
+ </message>
+ <message>
+ <location filename="src/CommitDialog.ui" line="56"/>
+ <location filename="src/CommitDialog.ui" line="76"/>
+ <location filename="src/CommitDialog.ui" line="115"/>
+ <location filename="src/CommitDialog.ui" line="135"/>
+ <location filename="src/CommitDialog.ui" line="155"/>
+ <source>---</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="src/CommitDialog.ui" line="63"/>
+ <location filename="src/CommitDialog.ui" line="142"/>
+ <source>Mail</source>
+ <translation>メール</translation>
+ </message>
+ <message>
+ <location filename="src/CommitDialog.ui" line="93"/>
+ <source>GPG Signing</source>
+ <translation>GPG署名</translation>
+ </message>
+ <message>
+ <location filename="src/CommitDialog.ui" line="102"/>
+ <source>ID</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="src/CommitDialog.ui" line="122"/>
+ <source>Name</source>
+ <translation>名前</translation>
+ </message>
+ <message>
+ <location filename="src/CommitDialog.ui" line="165"/>
+ <source>Configure...</source>
+ <translation>設定...</translation>
+ </message>
+ <message>
+ <location filename="src/CommitDialog.ui" line="174"/>
+ <source>Message</source>
+ <translation>メッセージ</translation>
+ </message>
+ <message>
+ <location filename="src/CommitDialog.ui" line="199"/>
+ <source>OK</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="src/CommitDialog.ui" line="209"/>
+ <source>Cancel</source>
+ <translation>キャンセル</translation>
+ </message>
</context>
<context>
<name>CommitExploreWindow</name>
<message>
<location filename="src/CommitExploreWindow.ui" line="14"/>
<source>Commit Explorer</source>
<translation>コミットエクスプローラー</translation>
</message>
<message>
- <location filename="src/CommitExploreWindow.ui" line="59"/>
+ <location filename="src/CommitExploreWindow.ui" line="65"/>
<source>Commit ID</source>
<translation>コミットID</translation>
</message>
<message>
- <location filename="src/CommitExploreWindow.ui" line="76"/>
+ <location filename="src/CommitExploreWindow.ui" line="82"/>
<source>Date</source>
<translation>日付</translation>
</message>
<message>
- <location filename="src/CommitExploreWindow.ui" line="83"/>
+ <location filename="src/CommitExploreWindow.ui" line="89"/>
<source>Author</source>
<translation>名前</translation>
</message>
<message>
- <location filename="src/CommitExploreWindow.cpp" line="76"/>
+ <location filename="src/CommitExploreWindow.cpp" line="80"/>
<source>Commit</source>
<translation>コミット</translation>
</message>
</context>
<context>
<name>CommitPropertyDialog</name>
<message>
<location filename="src/CommitPropertyDialog.ui" line="14"/>
- <source>Commit Properties</source>
+ <source>Commit Property</source>
+ <oldsource>Commit Properties</oldsource>
<translation>コミットのプロパティ</translation>
</message>
<message>
- <location filename="src/CommitPropertyDialog.ui" line="32"/>
+ <location filename="src/CommitPropertyDialog.ui" line="43"/>
<source>Date</source>
<translation>日付</translation>
</message>
<message>
- <location filename="src/CommitPropertyDialog.ui" line="49"/>
+ <location filename="src/CommitPropertyDialog.ui" line="53"/>
<source>Author</source>
<translation>名前</translation>
</message>
<message>
- <location filename="src/CommitPropertyDialog.ui" line="66"/>
+ <location filename="src/CommitPropertyDialog.ui" line="63"/>
+ <location filename="src/CommitPropertyDialog.ui" line="187"/>
<source>Mail</source>
<translation>メール</translation>
</message>
<message>
- <location filename="src/CommitPropertyDialog.ui" line="92"/>
+ <location filename="src/CommitPropertyDialog.ui" line="151"/>
+ <source>GPG Sign</source>
+ <translation>GPG署名</translation>
+ </message>
+ <message>
+ <location filename="src/CommitPropertyDialog.ui" line="167"/>
+ <source>ID</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="src/CommitPropertyDialog.ui" line="177"/>
+ <source>Name</source>
+ <translation>名前</translation>
+ </message>
+ <message>
+ <location filename="src/CommitPropertyDialog.ui" line="224"/>
<source>Commit ID</source>
<translation>コミットID</translation>
</message>
<message>
- <location filename="src/CommitPropertyDialog.ui" line="109"/>
+ <location filename="src/CommitPropertyDialog.ui" line="234"/>
<source>Parent IDs</source>
<translation>親ID</translation>
</message>
<message>
- <location filename="src/CommitPropertyDialog.ui" line="144"/>
+ <location filename="src/CommitPropertyDialog.ui" line="256"/>
+ <source>Files...</source>
+ <translation>ファイル...</translation>
+ </message>
+ <message>
+ <location filename="src/CommitPropertyDialog.ui" line="276"/>
+ <source>Explorer</source>
+ <translation>エクスプローラ</translation>
+ </message>
+ <message>
+ <location filename="src/CommitPropertyDialog.ui" line="296"/>
+ <source>Checkout</source>
+ <translation>チェックアウト</translation>
+ </message>
+ <message>
+ <location filename="src/CommitPropertyDialog.ui" line="303"/>
+ <source>Jump</source>
+ <translation>移動</translation>
+ </message>
+ <message>
+ <location filename="src/CommitPropertyDialog.ui" line="323"/>
<source>Close</source>
<translation>閉じる</translation>
</message>
+ <message>
+ <location filename="src/CommitPropertyDialog.cpp" line="59"/>
+ <source><Unknown></source>
+ <translation><不明></translation>
+ </message>
+</context>
+<context>
+ <name>CommitViewWindow</name>
+ <message>
+ <location filename="src/CommitViewWindow.ui" line="14"/>
+ <source>Commit View</source>
+ <translation>コミットビュー</translation>
+ </message>
+ <message>
+ <location filename="src/CommitViewWindow.cpp" line="58"/>
+ <source>History</source>
+ <translation>履歴</translation>
+ </message>
</context>
<context>
<name>ConfigCredentialHelperDialog</name>
<message>
<location filename="src/ConfigCredentialHelperDialog.ui" line="14"/>
<source>Dialog</source>
<translation></translation>
</message>
<message>
<location filename="src/ConfigCredentialHelperDialog.ui" line="26"/>
<source>wincred</source>
<translation></translation>
</message>
<message>
<location filename="src/ConfigCredentialHelperDialog.ui" line="39"/>
<source>winstore</source>
<translation></translation>
</message>
<message>
<location filename="src/ConfigCredentialHelperDialog.ui" line="52"/>
<source>None</source>
<translation>なし</translation>
</message>
<message>
<location filename="src/ConfigCredentialHelperDialog.ui" line="65"/>
<source>OK</source>
<translation></translation>
</message>
<message>
<location filename="src/ConfigCredentialHelperDialog.ui" line="78"/>
<source>Cancel</source>
<translation>キャンセル</translation>
</message>
<message>
<location filename="src/ConfigCredentialHelperDialog.ui" line="91"/>
<source>Other</source>
<translation>その他</translation>
</message>
</context>
+<context>
+ <name>ConfigSigningDialog</name>
+ <message>
+ <location filename="src/ConfigSigningDialog.ui" line="14"/>
+ <source>Signing Policy</source>
+ <translation>署名ポリシー</translation>
+ </message>
+ <message>
+ <location filename="src/ConfigSigningDialog.ui" line="20"/>
+ <source>Config commit.gpgsign</source>
+ <translation>commit.gpgsign の設定</translation>
+ </message>
+ <message>
+ <location filename="src/ConfigSigningDialog.ui" line="26"/>
+ <source>global</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="src/ConfigSigningDialog.ui" line="36"/>
+ <source>local</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="src/ConfigSigningDialog.ui" line="64"/>
+ <source>OK</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="src/ConfigSigningDialog.ui" line="71"/>
+ <source>Cancel</source>
+ <translation>キャンセル</translation>
+ </message>
+</context>
+<context>
+ <name>CreateRepositoryDialog</name>
+ <message>
+ <location filename="src/CreateRepositoryDialog.ui" line="14"/>
+ <location filename="src/CreateRepositoryDialog.cpp" line="42"/>
+ <location filename="src/CreateRepositoryDialog.cpp" line="46"/>
+ <location filename="src/CreateRepositoryDialog.cpp" line="50"/>
+ <location filename="src/CreateRepositoryDialog.cpp" line="54"/>
+ <source>Create Repository</source>
+ <translation>リポジトリの作成</translation>
+ </message>
+ <message>
+ <location filename="src/CreateRepositoryDialog.ui" line="22"/>
+ <source>Path</source>
+ <translation>パス</translation>
+ </message>
+ <message>
+ <location filename="src/CreateRepositoryDialog.ui" line="32"/>
+ <source>Browse</source>
+ <translation>参照</translation>
+ </message>
+ <message>
+ <location filename="src/CreateRepositoryDialog.ui" line="54"/>
+ <source>Bookmark</source>
+ <translation>ブックマーク</translation>
+ </message>
+ <message>
+ <location filename="src/CreateRepositoryDialog.ui" line="63"/>
+ <location filename="src/CreateRepositoryDialog.ui" line="88"/>
+ <source>Name</source>
+ <translation>名前</translation>
+ </message>
+ <message>
+ <location filename="src/CreateRepositoryDialog.ui" line="76"/>
+ <source>Remote</source>
+ <translation>リモート</translation>
+ </message>
+ <message>
+ <location filename="src/CreateRepositoryDialog.ui" line="98"/>
+ <source>URL</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="src/CreateRepositoryDialog.ui" line="108"/>
+ <source>Test</source>
+ <translation>テスト</translation>
+ </message>
+ <message>
+ <location filename="src/CreateRepositoryDialog.ui" line="146"/>
+ <source>OK</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="src/CreateRepositoryDialog.ui" line="153"/>
+ <source>Cancel</source>
+ <translation>キャンセル</translation>
+ </message>
+ <message>
+ <location filename="src/CreateRepositoryDialog.cpp" line="19"/>
+ <source>A valid git repository already exists there.</source>
+ <translation>有効なリポジトリが既に存在しています。</translation>
+ </message>
+ <message>
+ <location filename="src/CreateRepositoryDialog.cpp" line="42"/>
+ <location filename="src/CreateRepositoryDialog.cpp" line="50"/>
+ <source>The specified path is not a directory.</source>
+ <translation>指定されたパスはフォルダではありません。</translation>
+ </message>
+ <message>
+ <location filename="src/CreateRepositoryDialog.cpp" line="54"/>
+ <source>Remote name is invalid.</source>
+ <translation>リモート名が無効です。</translation>
+ </message>
+ <message>
+ <location filename="src/CreateRepositoryDialog.cpp" line="62"/>
+ <source>Destination Path</source>
+ <translation>作成先のパス</translation>
+ </message>
+</context>
<context>
<name>DeleteBranchDialog</name>
<message>
<location filename="src/DeleteBranchDialog.ui" line="14"/>
<source>Delete Branch</source>
<translation>ブランチの削除</translation>
</message>
<message>
<location filename="src/DeleteBranchDialog.ui" line="25"/>
<source>&All branches</source>
<translation>全てのブランチ(&A)</translation>
</message>
<message>
<location filename="src/DeleteBranchDialog.ui" line="45"/>
<source>OK</source>
<translation></translation>
</message>
<message>
<location filename="src/DeleteBranchDialog.ui" line="52"/>
<source>Cancel</source>
<translation>キャンセル</translation>
</message>
</context>
<context>
<name>DeleteTagsDialog</name>
<message>
<location filename="src/DeleteTagsDialog.ui" line="14"/>
<source>Delete tags</source>
<translation>タグを削除</translation>
</message>
<message>
<location filename="src/DeleteTagsDialog.ui" line="32"/>
<source>Check all</source>
<translation>全てチェック</translation>
</message>
<message>
<location filename="src/DeleteTagsDialog.ui" line="52"/>
<source>OK</source>
<translation></translation>
</message>
<message>
<location filename="src/DeleteTagsDialog.ui" line="62"/>
<source>Cancel</source>
<translation>キャンセル</translation>
</message>
</context>
<context>
- <name>EditTagDialog</name>
+ <name>EditGitIgnoreDialog</name>
<message>
- <location filename="src/EditTagDialog.ui" line="14"/>
- <source>Edit tag</source>
- <translation>タグの編集</translation>
+ <location filename="src/EditGitIgnoreDialog.ui" line="14"/>
+ <source>Edit Git Ignore</source>
+ <translation>Gitで無視するファイルの編集</translation>
</message>
<message>
- <location filename="src/EditTagDialog.ui" line="22"/>
- <source>Tag</source>
- <translation>タグ</translation>
+ <location filename="src/EditGitIgnoreDialog.ui" line="20"/>
+ <location filename="src/EditGitIgnoreDialog.ui" line="27"/>
+ <location filename="src/EditGitIgnoreDialog.ui" line="34"/>
+ <location filename="src/EditGitIgnoreDialog.ui" line="41"/>
+ <source>RadioButton</source>
+ <translation></translation>
</message>
<message>
- <source>Push tags</source>
- <translation type="vanished">タグをプッシュする</translation>
+ <location filename="src/EditGitIgnoreDialog.ui" line="63"/>
+ <source>Edit the file</source>
+ <translation>ファイルを編集する</translation>
</message>
<message>
- <location filename="src/EditTagDialog.ui" line="49"/>
+ <location filename="src/EditGitIgnoreDialog.ui" line="83"/>
<source>OK</source>
<translation></translation>
</message>
<message>
- <location filename="src/EditTagDialog.ui" line="56"/>
+ <location filename="src/EditGitIgnoreDialog.ui" line="90"/>
<source>Cancel</source>
<translation>キャンセル</translation>
</message>
</context>
<context>
- <name>FileDiffWidget</name>
+ <name>EditRemoteDialog</name>
<message>
- <location filename="src/FileDiffWidget.ui" line="14"/>
- <source>Dialog</source>
- <translation></translation>
+ <location filename="src/EditRemoteDialog.ui" line="14"/>
+ <source>Edit Remote</source>
+ <translation>リモートの編集</translation>
</message>
-</context>
-<context>
- <name>FileHistoryWindow</name>
<message>
- <location filename="src/FileHistoryWindow.ui" line="14"/>
- <source>File History</source>
- <translation>ファイルの履歴</translation>
+ <location filename="src/EditRemoteDialog.ui" line="20"/>
+ <source>Remote</source>
+ <translation>リモート</translation>
</message>
<message>
- <location filename="src/FileHistoryWindow.ui" line="20"/>
- <location filename="src/FileHistoryWindow.ui" line="27"/>
- <source>TextLabel</source>
- <translation></translation>
+ <location filename="src/EditRemoteDialog.ui" line="26"/>
+ <source>Name</source>
+ <translation>名前</translation>
</message>
<message>
- <location filename="src/FileHistoryWindow.cpp" line="110"/>
- <source>Commit</source>
- <translation>コミット</translation>
+ <location filename="src/EditRemoteDialog.ui" line="33"/>
+ <source>URL</source>
+ <translation></translation>
</message>
<message>
- <location filename="src/FileHistoryWindow.cpp" line="111"/>
- <source>Date</source>
- <translation>日付</translation>
+ <location filename="src/EditRemoteDialog.ui" line="53"/>
+ <source>&Test</source>
+ <translation>テスト(&T)</translation>
</message>
<message>
- <location filename="src/FileHistoryWindow.cpp" line="112"/>
- <source>Author</source>
- <translation>名前</translation>
+ <location filename="src/EditRemoteDialog.ui" line="81"/>
+ <source>OK</source>
+ <translation></translation>
</message>
<message>
- <location filename="src/FileHistoryWindow.cpp" line="113"/>
- <source>Description</source>
- <translation>概要</translation>
+ <location filename="src/EditRemoteDialog.ui" line="88"/>
+ <source>Close</source>
+ <translation>閉じる</translation>
</message>
</context>
<context>
- <name>FilePreviewWidget</name>
+ <name>EditTagDialog</name>
<message>
- <location filename="src/FilePreviewWidget.cpp" line="548"/>
- <source>Save as...</source>
- <translation>名前を付けて保存...</translation>
+ <source>Edit tag</source>
+ <translation type="vanished">タグの編集</translation>
</message>
<message>
- <location filename="src/FilePreviewWidget.cpp" line="549"/>
- <source>test</source>
- <translation></translation>
+ <source>Tag</source>
+ <translation type="vanished">タグ</translation>
</message>
<message>
- <location filename="src/FilePreviewWidget.cpp" line="557"/>
- <source>Save as</source>
- <translation>名前を付けて保存</translation>
+ <source>Push tags</source>
+ <translation type="vanished">タグをプッシュする</translation>
+ </message>
+ <message>
+ <source>Cancel</source>
+ <translation type="vanished">キャンセル</translation>
</message>
</context>
<context>
- <name>FilePropertyDialog</name>
+ <name>EditTagsDialog</name>
<message>
- <location filename="src/FilePropertyDialog.ui" line="14"/>
- <source>File Properties</source>
- <translation>ファイルのプロパティ</translation>
+ <location filename="src/EditTagsDialog.ui" line="14"/>
+ <source>Edit Tags</source>
+ <translation>タグの編集</translation>
</message>
<message>
- <location filename="src/FilePropertyDialog.ui" line="78"/>
- <source>&Close</source>
- <translation>閉じる(&C)</translation>
+ <location filename="src/EditTagsDialog.ui" line="41"/>
+ <source>Add...</source>
+ <translation>追加...</translation>
+ </message>
+ <message>
+ <location filename="src/EditTagsDialog.ui" line="48"/>
+ <source>Delete</source>
+ <translation>削除</translation>
+ </message>
+ <message>
+ <location filename="src/EditTagsDialog.ui" line="68"/>
+ <source>Close</source>
+ <translation>閉じる</translation>
+ </message>
+</context>
+<context>
+ <name>ExperimentDialog</name>
+ <message>
+ <location filename="src/ExperimentDialog.ui" line="14"/>
+ <source>Dialog</source>
+ <translation></translation>
+ </message>
+</context>
+<context>
+ <name>FileDiffWidget</name>
+ <message>
+ <location filename="src/FileDiffWidget.ui" line="14"/>
+ <source>Dialog</source>
+ <translation></translation>
+ </message>
+</context>
+<context>
+ <name>FileHistoryWindow</name>
+ <message>
+ <location filename="src/FileHistoryWindow.ui" line="14"/>
+ <source>File History</source>
+ <translation>ファイルの履歴</translation>
+ </message>
+ <message>
+ <location filename="src/FileHistoryWindow.ui" line="20"/>
+ <location filename="src/FileHistoryWindow.ui" line="27"/>
+ <source>TextLabel</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="src/FileHistoryWindow.cpp" line="112"/>
+ <source>Commit</source>
+ <translation>コミット</translation>
+ </message>
+ <message>
+ <location filename="src/FileHistoryWindow.cpp" line="113"/>
+ <source>Date</source>
+ <translation>日付</translation>
+ </message>
+ <message>
+ <location filename="src/FileHistoryWindow.cpp" line="114"/>
+ <source>Author</source>
+ <translation>名前</translation>
+ </message>
+ <message>
+ <location filename="src/FileHistoryWindow.cpp" line="115"/>
+ <source>Description</source>
+ <translation>概要</translation>
+ </message>
+</context>
+<context>
+ <name>FilePreviewWidget</name>
+ <message>
+ <source>Save as...</source>
+ <translation type="vanished">名前を付けて保存...</translation>
+ </message>
+ <message>
+ <source>Save as</source>
+ <translation type="vanished">名前を付けて保存</translation>
+ </message>
+</context>
+<context>
+ <name>FilePropertyDialog</name>
+ <message>
+ <location filename="src/FilePropertyDialog.ui" line="14"/>
+ <source>File Property</source>
+ <oldsource>File Properties</oldsource>
+ <translation>ファイルのプロパティ</translation>
+ </message>
+ <message>
+ <location filename="src/FilePropertyDialog.ui" line="78"/>
+ <source>&Close</source>
+ <translation>閉じる(&C)</translation>
+ </message>
+</context>
+<context>
+ <name>FileViewWidget</name>
+ <message>
+ <location filename="src/FileViewWidget.cpp" line="31"/>
+ <source>Form</source>
+ <translation></translation>
+ </message>
+</context>
+<context>
+ <name>InputNewTagDialog</name>
+ <message>
+ <location filename="src/InputNewTagDialog.ui" line="14"/>
+ <source>Edit tag</source>
+ <translation>タグの編集</translation>
+ </message>
+ <message>
+ <location filename="src/InputNewTagDialog.ui" line="28"/>
+ <source>Tag</source>
+ <translation>タグ</translation>
+ </message>
+ <message>
+ <location filename="src/InputNewTagDialog.ui" line="55"/>
+ <source>OK</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="src/InputNewTagDialog.ui" line="62"/>
+ <source>Cancel</source>
+ <translation>キャンセル</translation>
</message>
</context>
<context>
<name>JumpDialog</name>
<message>
<location filename="src/JumpDialog.ui" line="14"/>
<source>Jump</source>
<translation>移動</translation>
</message>
<message>
- <location filename="src/JumpDialog.ui" line="41"/>
+ <location filename="src/JumpDialog.ui" line="24"/>
+ <source>Branches and Tags</source>
+ <translation>ブランチとタグ</translation>
+ </message>
+ <message>
+ <location filename="src/JumpDialog.ui" line="47"/>
<source>&Filter</source>
<translation>フィルタ(&F)</translation>
</message>
<message>
- <location filename="src/JumpDialog.ui" line="90"/>
+ <location filename="src/JumpDialog.ui" line="98"/>
+ <source>Find</source>
+ <translation>検索</translation>
+ </message>
+ <message>
+ <location filename="src/JumpDialog.ui" line="126"/>
+ <source>&Checkout</source>
+ <translation>チェックアウト(&C)</translation>
+ </message>
+ <message>
+ <location filename="src/JumpDialog.ui" line="146"/>
<source>OK</source>
<translation></translation>
</message>
<message>
- <location filename="src/JumpDialog.ui" line="97"/>
+ <location filename="src/JumpDialog.ui" line="153"/>
<source>Cancel</source>
<translation>キャンセル</translation>
</message>
<message>
<location filename="src/JumpDialog.cpp" line="28"/>
<source>Name</source>
<translation>名前</translation>
</message>
</context>
+<context>
+ <name>LineEditDialog</name>
+ <message>
+ <location filename="src/LineEditDialog.ui" line="14"/>
+ <source>Dialog</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="src/LineEditDialog.ui" line="20"/>
+ <source>TextLabel</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="src/LineEditDialog.ui" line="45"/>
+ <source>OK</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="src/LineEditDialog.ui" line="52"/>
+ <source>Cancel</source>
+ <translation>キャンセル</translation>
+ </message>
+</context>
<context>
<name>MainWindow</name>
<message>
<location filename="src/MainWindow.ui" line="14"/>
<source>Guitar</source>
<translation></translation>
</message>
<message>
<location filename="src/MainWindow.ui" line="96"/>
- <location filename="src/MainWindow.ui" line="1127"/>
- <location filename="src/MainWindow.ui" line="1130"/>
- <location filename="src/MainWindow.cpp" line="2880"/>
- <location filename="src/MainWindow.cpp" line="2885"/>
- <location filename="src/MainWindow.cpp" line="2902"/>
- <location filename="src/MainWindow.cpp" line="2907"/>
+ <location filename="src/MainWindow.ui" line="1324"/>
+ <location filename="src/MainWindow.ui" line="1327"/>
+ <location filename="src/MainWindow.cpp" line="3383"/>
+ <location filename="src/MainWindow.cpp" line="3388"/>
+ <location filename="src/MainWindow.cpp" line="3405"/>
+ <location filename="src/MainWindow.cpp" line="3410"/>
<source>Clone</source>
<translation>クローン</translation>
</message>
<message>
<location filename="src/MainWindow.ui" line="131"/>
<source>Fetch</source>
<translation>フェッチ</translation>
</message>
<message>
<location filename="src/MainWindow.ui" line="166"/>
<source>Pull</source>
<translation>プル</translation>
</message>
<message>
<location filename="src/MainWindow.ui" line="201"/>
<source>Push</source>
<translation>プッシュ</translation>
</message>
<message>
<location filename="src/MainWindow.ui" line="252"/>
<source>Terminal</source>
<translation>端末</translation>
</message>
<message>
+ <location filename="src/MainWindow.ui" line="287"/>
<source>Explorer</source>
- <translation type="vanished">エクスプローラ</translation>
+ <translation>エクスプローラ</translation>
</message>
<message>
- <location filename="src/MainWindow.ui" line="357"/>
+ <location filename="src/MainWindow.ui" line="373"/>
<source>Repository</source>
<translation>リポジトリ</translation>
</message>
<message>
- <location filename="src/MainWindow.ui" line="364"/>
+ <location filename="src/MainWindow.ui" line="380"/>
<source>Branch Name</source>
<translation>ブランチ名</translation>
</message>
<message>
- <location filename="src/MainWindow.ui" line="556"/>
+ <location filename="src/MainWindow.ui" line="422"/>
+ <source>Offline</source>
+ <translation>オフライン</translation>
+ </message>
+ <message>
+ <location filename="src/MainWindow.ui" line="432"/>
+ <source>Online</source>
+ <translation>オンライン</translation>
+ </message>
+ <message>
+ <location filename="src/MainWindow.ui" line="638"/>
<source>PushButton</source>
<translation></translation>
</message>
<message>
- <location filename="src/MainWindow.ui" line="670"/>
- <location filename="src/MainWindow.cpp" line="1984"/>
+ <location filename="src/MainWindow.ui" line="752"/>
+ <location filename="src/MainWindow.cpp" line="2399"/>
<source>Unstage</source>
<translation>除外</translation>
</message>
<message>
- <location filename="src/MainWindow.ui" line="699"/>
+ <location filename="src/MainWindow.ui" line="781"/>
<source>Select all</source>
<translation>全て選択</translation>
</message>
<message>
- <location filename="src/MainWindow.ui" line="734"/>
- <location filename="src/MainWindow.cpp" line="1919"/>
+ <location filename="src/MainWindow.ui" line="816"/>
+ <location filename="src/MainWindow.cpp" line="2269"/>
<source>Stage</source>
<translation>追加</translation>
</message>
<message>
- <location filename="src/MainWindow.ui" line="763"/>
- <location filename="src/MainWindow.cpp" line="1020"/>
- <location filename="src/MainWindow.cpp" line="1541"/>
- <location filename="src/MainWindow.cpp" line="1548"/>
+ <location filename="src/MainWindow.ui" line="845"/>
+ <location filename="src/MainWindow.cpp" line="1197"/>
+ <location filename="src/MainWindow.cpp" line="1832"/>
<source>Commit</source>
<translation>コミット</translation>
</message>
<message>
- <location filename="src/MainWindow.ui" line="894"/>
+ <location filename="src/MainWindow.ui" line="976"/>
<source>&File</source>
<translation>ファイル(&F)</translation>
</message>
<message>
- <location filename="src/MainWindow.ui" line="901"/>
+ <location filename="src/MainWindow.ui" line="988"/>
<source>&View</source>
<translation>表示(&V)</translation>
</message>
<message>
- <location filename="src/MainWindow.ui" line="907"/>
+ <location filename="src/MainWindow.ui" line="994"/>
<source>&Edit</source>
<translation>編集(&E)</translation>
</message>
+ <message>
+ <location filename="src/MainWindow.ui" line="1337"/>
+ <location filename="src/MainWindow.cpp" line="2153"/>
+ <source>Edit tags...</source>
+ <translation>タグの編集...</translation>
+ </message>
+ <message>
+ <location filename="src/MainWindow.ui" line="1340"/>
+ <source>Edit tags</source>
+ <translation>タグの編集</translation>
+ </message>
+ <message>
+ <location filename="src/MainWindow.ui" line="1381"/>
+ <source>push -u</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="src/MainWindow.ui" line="1386"/>
+ <source>reset HEAD~1</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="src/MainWindow.ui" line="1391"/>
+ <source>Create a repository</source>
+ <translation>リポジトリの作成</translation>
+ </message>
+ <message>
+ <location filename="src/MainWindow.ui" line="1400"/>
+ <source>Stop process</source>
+ <translation>処理の停止</translation>
+ </message>
+ <message>
+ <location filename="src/MainWindow.ui" line="1405"/>
+ <source>E&xit</source>
+ <translation>終了(&X)</translation>
+ </message>
+ <message>
+ <location filename="src/MainWindow.ui" line="1408"/>
+ <source>Ctrl+Q</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="src/MainWindow.ui" line="1413"/>
+ <source>Reflog...</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="src/MainWindow.ui" line="1418"/>
+ <source>Property...</source>
+ <translation>プロパティ...</translation>
+ </message>
+ <message>
+ <location filename="src/MainWindow.ui" line="1423"/>
+ <location filename="src/MainWindow.ui" line="1426"/>
+ <source>Set GPG signing</source>
+ <translation>GPS署名の指定</translation>
+ </message>
<message>
<source>&Branch</source>
<translation type="vanished">ブランチ(&B)</translation>
</message>
<message>
- <location filename="src/MainWindow.ui" line="918"/>
+ <location filename="src/MainWindow.ui" line="1006"/>
<source>&Help</source>
<translation>ヘルプ(&H)</translation>
</message>
<message>
<source>&Tag</source>
<oldsource>Tag</oldsource>
<translation type="vanished">タグ(&T)</translation>
</message>
<message>
- <location filename="src/MainWindow.ui" line="287"/>
<source>File</source>
- <translation>ファイル</translation>
+ <translation type="vanished">ファイル</translation>
</message>
<message>
- <location filename="src/MainWindow.ui" line="924"/>
+ <location filename="src/MainWindow.ui" line="1012"/>
<source>&Window</source>
<translation>ウィンドウ(&W)</translation>
</message>
<message>
- <location filename="src/MainWindow.ui" line="930"/>
+ <location filename="src/MainWindow.ui" line="1018"/>
<source>&Repository</source>
<translation>リポジトリ(&R)</translation>
</message>
<message>
- <location filename="src/MainWindow.ui" line="940"/>
+ <location filename="src/MainWindow.ui" line="1038"/>
<source>Experiment</source>
<translation></translation>
</message>
<message>
- <location filename="src/MainWindow.ui" line="968"/>
+ <location filename="src/MainWindow.ui" line="1064"/>
<source>Log</source>
<translation>ログ</translation>
</message>
<message>
- <location filename="src/MainWindow.ui" line="1025"/>
+ <location filename="src/MainWindow.ui" line="1231"/>
<source>&Open existing working copy...</source>
<translation>既存の作業コピーを開く(&O)...</translation>
</message>
<message>
- <location filename="src/MainWindow.ui" line="1028"/>
- <location filename="src/MainWindow.cpp" line="2127"/>
+ <location filename="src/MainWindow.ui" line="1234"/>
+ <location filename="src/MainWindow.cpp" line="2547"/>
<source>Add existing working copy</source>
<translation>既存の作業コピーを追加</translation>
</message>
<message>
- <location filename="src/MainWindow.ui" line="1033"/>
- <location filename="src/MainWindow.ui" line="1036"/>
+ <location filename="src/MainWindow.ui" line="1239"/>
+ <location filename="src/MainWindow.ui" line="1242"/>
<source>Refresh</source>
<translation>更新</translation>
</message>
<message>
- <location filename="src/MainWindow.ui" line="1039"/>
+ <location filename="src/MainWindow.ui" line="1245"/>
<source>F5</source>
<translation></translation>
</message>
<message>
- <location filename="src/MainWindow.ui" line="1044"/>
+ <location filename="src/MainWindow.ui" line="1254"/>
<source>&Commit</source>
<translation>コミット(&C)</translation>
</message>
<message>
- <location filename="src/MainWindow.ui" line="1053"/>
+ <location filename="src/MainWindow.ui" line="1263"/>
<source>&Push</source>
<translation>プッシュ(&P)</translation>
</message>
<message>
- <location filename="src/MainWindow.ui" line="1061"/>
- <source>set remote origin url</source>
- <translation></translation>
- </message>
- <message>
- <location filename="src/MainWindow.ui" line="1066"/>
- <source>config --global credential.helper</source>
- <translation></translation>
- </message>
- <message>
- <location filename="src/MainWindow.ui" line="1071"/>
+ <location filename="src/MainWindow.ui" line="1271"/>
<source>test</source>
<translation></translation>
</message>
<message>
- <location filename="src/MainWindow.ui" line="1074"/>
+ <location filename="src/MainWindow.ui" line="1274"/>
<source>Ctrl+T</source>
<translation></translation>
</message>
<message>
- <location filename="src/MainWindow.ui" line="1079"/>
<source>Add all</source>
- <translation>全て追加</translation>
+ <translation type="vanished">全て追加</translation>
</message>
<message>
- <location filename="src/MainWindow.ui" line="1084"/>
+ <location filename="src/MainWindow.ui" line="1283"/>
<source>Pu&ll</source>
<translation>プル(&L)</translation>
</message>
<message>
- <location filename="src/MainWindow.ui" line="1089"/>
+ <location filename="src/MainWindow.ui" line="1292"/>
<source>&Fetch</source>
<translation>フェッチ(&F)</translation>
</message>
<message>
- <location filename="src/MainWindow.ui" line="1094"/>
- <location filename="src/MainWindow.ui" line="1097"/>
+ <location filename="src/MainWindow.ui" line="1297"/>
+ <location filename="src/MainWindow.ui" line="1300"/>
<source>Edit global .gitconfig</source>
<translation>グローバル .gitignore を編集</translation>
</message>
<message>
- <location filename="src/MainWindow.ui" line="1102"/>
+ <location filename="src/MainWindow.ui" line="1305"/>
<source>Edit .git/config</source>
<translation>.git/config を編集</translation>
</message>
<message>
- <location filename="src/MainWindow.ui" line="1107"/>
+ <location filename="src/MainWindow.ui" line="1310"/>
<source>Edit .gitignore</source>
<translation>.gitignore を編集</translation>
</message>
<message>
- <location filename="src/MainWindow.ui" line="1112"/>
+ <location filename="src/MainWindow.ui" line="1315"/>
<source>&Settings</source>
<translation>設定(&S)</translation>
</message>
<message>
- <location filename="src/MainWindow.ui" line="1117"/>
<source>&New branch...</source>
<oldsource>&New branch</oldsource>
- <translation>新しいブランチ(&N)...</translation>
+ <translation type="vanished">新しいブランチ(&N)...</translation>
</message>
<message>
- <location filename="src/MainWindow.ui" line="1168"/>
+ <location filename="src/MainWindow.ui" line="1363"/>
<source>&Jump...</source>
<translation>移動(&J)...</translation>
</message>
<message>
- <location filename="src/MainWindow.ui" line="1171"/>
+ <location filename="src/MainWindow.ui" line="1366"/>
<source>Ctrl+J</source>
<translation></translation>
</message>
<message>
- <location filename="src/MainWindow.ui" line="1176"/>
+ <location filename="src/MainWindow.ui" line="1371"/>
<source>Check&out...</source>
<translation>チェックアウト(&O)...</translation>
</message>
<message>
- <location filename="src/MainWindow.ui" line="1181"/>
- <source>push -u origin master</source>
- <translation></translation>
- </message>
- <message>
- <location filename="src/MainWindow.ui" line="1186"/>
- <location filename="src/MainWindow.cpp" line="1831"/>
+ <location filename="src/MainWindow.ui" line="1376"/>
+ <location filename="src/MainWindow.cpp" line="2149"/>
<source>Delete branch...</source>
<translation>ブランチの削除...</translation>
</message>
<message>
<source>Check&out</source>
<translation type="vanished">チェックアウト(&O)</translation>
</message>
<message>
- <location filename="src/MainWindow.ui" line="1122"/>
<source>&Merge</source>
- <translation>マージ(&M)</translation>
+ <translation type="vanished">マージ(&M)</translation>
</message>
<message>
- <location filename="src/MainWindow.ui" line="1135"/>
+ <location filename="src/MainWindow.ui" line="1332"/>
<source>&About</source>
<translation>Guitarについて(&A)</translation>
</message>
<message>
- <location filename="src/MainWindow.ui" line="1140"/>
<source>Tag...</source>
- <translation>タグ...</translation>
+ <translation type="vanished">タグ...</translation>
</message>
<message>
- <location filename="src/MainWindow.ui" line="1145"/>
+ <location filename="src/MainWindow.ui" line="1345"/>
<source>Push all tags</source>
<translation>全てのタグをプッシュ</translation>
</message>
<message>
- <location filename="src/MainWindow.ui" line="1150"/>
- <location filename="src/MainWindow.cpp" line="1836"/>
<source>Delete tags...</source>
- <translation>タグを削除...</translation>
+ <translation type="vanished">タグを削除...</translation>
</message>
<message>
- <location filename="src/MainWindow.ui" line="1155"/>
+ <location filename="src/MainWindow.ui" line="1350"/>
<source>Set config user</source>
<translation>ユーザー情報を設定</translation>
</message>
<message>
- <location filename="src/MainWindow.ui" line="1163"/>
+ <location filename="src/MainWindow.ui" line="1358"/>
<source>&Log</source>
<translation>ログ(&L)</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="452"/>
+ <location filename="src/MainWindow.cpp" line="663"/>
<source>Unnamed</source>
<translation>無名</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="668"/>
+ <location filename="src/MainWindow.cpp" line="919"/>
<source>Default</source>
<translation></translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="1019"/>
+ <location filename="src/MainWindow.cpp" line="1196"/>
<source>Graph</source>
<translation>樹形図</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="1021"/>
+ <location filename="src/MainWindow.cpp" line="1198"/>
<source>Date</source>
<translation>日付</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="1022"/>
+ <location filename="src/MainWindow.cpp" line="1199"/>
<source>Author</source>
<translation>名前</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="1023"/>
+ <location filename="src/MainWindow.cpp" line="1200"/>
<source>Description</source>
<translation>概要</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="1105"/>
+ <location filename="src/MainWindow.cpp" line="1375"/>
<source>, %1 ahead</source>
<translation></translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="1108"/>
+ <location filename="src/MainWindow.cpp" line="1378"/>
<source>, %1 behind</source>
<translation></translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="1259"/>
<source>Retrieving the log is in progress</source>
- <translation>ログの取得中</translation>
+ <translation type="vanished">ログの取得中</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="1262"/>
<source>Retrieving commit log...
</source>
- <translation>コミットログの取得中...</translation>
+ <translation type="vanished">コミットログの取得中...</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="1266"/>
<source>Retrieving branches...
</source>
- <translation>ブランチを取得中...</translation>
+ <translation type="vanished">ブランチを取得中...</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="1269"/>
<source>Retrieving tags...
</source>
- <translation>タグを取得中...</translation>
+ <translation type="vanished">タグを取得中...</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="1295"/>
<source>Canceled by user
</source>
- <translation>ユーザーによるキャンセル</translation>
+ <translation type="vanished">ユーザーによるキャンセル</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="1316"/>
- <location filename="src/MainWindow.cpp" line="1591"/>
+ <location filename="src/MainWindow.cpp" line="1598"/>
+ <location filename="src/MainWindow.cpp" line="1885"/>
<source>Uncommited changes</source>
<translation>コミットされていない変更があります</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="1392"/>
+ <location filename="src/MainWindow.cpp" line="1680"/>
<source>Confirm Remove</source>
<translation></translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="1392"/>
+ <location filename="src/MainWindow.cpp" line="1680"/>
<source>Are you sure you want to remove the repository from bookmarks ?</source>
<translation>リポジトリをブックマークから削除してよろしいですか?</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="1392"/>
+ <location filename="src/MainWindow.cpp" line="1680"/>
<source>(Files will NOT be deleted)</source>
<translation>(ファルは削除されません)</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="1413"/>
- <location filename="src/MainWindow.cpp" line="1420"/>
+ <location filename="src/MainWindow.cpp" line="1701"/>
+ <location filename="src/MainWindow.cpp" line="1708"/>
<source>Open Repository</source>
<translation>リポジトリを開く</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="1413"/>
+ <location filename="src/MainWindow.cpp" line="1701"/>
<source>No such folder</source>
<translation>そのようなフォルダはありません</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="1413"/>
+ <location filename="src/MainWindow.cpp" line="1701"/>
<source>Remove from bookmark ?</source>
<translation></translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="1420"/>
+ <location filename="src/MainWindow.cpp" line="1708"/>
<source>Not a valid git repository</source>
<translation>有効なリポジトリではありません</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="1548"/>
+ <location filename="src/MainWindow.cpp" line="1832"/>
<source>Commit message can not be omitted.</source>
<translation>コミットメッセージを空にすることはできません。</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="1682"/>
<source>Config credential helper</source>
- <translation>資格ヘルパーの設定</translation>
+ <translation type="vanished">資格ヘルパーの設定</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="1682"/>
<source>Invalid credential helper name</source>
- <translation>資格ヘルパー名が無効です</translation>
+ <translation type="vanished">資格ヘルパー名が無効です</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="1707"/>
<source>&Properties</source>
- <translation>プロパティ(&P)</translation>
+ <translation type="vanished">プロパティ(&P)</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="1726"/>
+ <location filename="src/MainWindow.cpp" line="2045"/>
<source>&Add new group</source>
<translation>新しいグループを追加(&A)</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="1727"/>
+ <location filename="src/MainWindow.cpp" line="2046"/>
<source>&Delete group</source>
<translation>グループを削除(&D)</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="1728"/>
+ <location filename="src/MainWindow.cpp" line="2047"/>
<source>&Rename group</source>
<translation>グループ名の変更(&R)</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="1733"/>
+ <location filename="src/MainWindow.cpp" line="2052"/>
<source>New group</source>
<translation>新しいグループ</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="1757"/>
+ <location filename="src/MainWindow.cpp" line="2076"/>
<source>Open &terminal</source>
<translation>端末を開く(&T)</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="1758"/>
+ <location filename="src/MainWindow.cpp" line="2077"/>
<source>Open command promp&t</source>
<translation>コマンドプロンプトを開く(&T)</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="1760"/>
+ <location filename="src/MainWindow.cpp" line="2079"/>
<source>&Open</source>
<translation>開く(&O)</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="1769"/>
+ <location filename="src/MainWindow.cpp" line="2088"/>
<source>Open &folder</source>
<translation>フォルダを開く(&F)</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="1771"/>
+ <location filename="src/MainWindow.cpp" line="2090"/>
<source>&Remove</source>
<translation>削除(&R)</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="1773"/>
<source>Set remote URL</source>
- <translation>リモートURLを設定</translation>
+ <translation type="vanished">リモートURLを設定</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="1825"/>
+ <location filename="src/MainWindow.cpp" line="2143"/>
<source>Edit comment...</source>
<translation>コメントを編集</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="1830"/>
<source>Checkout...</source>
- <translation>チェックアウト...</translation>
+ <translation type="vanished">チェックアウト...</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="1833"/>
<source>Add a tag...</source>
- <translation>タグを追加...</translation>
+ <translation type="vanished">タグを追加...</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="1838"/>
+ <location filename="src/MainWindow.cpp" line="2155"/>
<source>Explore</source>
<translation>探索</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="1843"/>
+ <location filename="src/MainWindow.cpp" line="2160"/>
<source>Reset HEAD</source>
<translation>HEADをリセット</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="1896"/>
- <location filename="src/MainWindow.cpp" line="1923"/>
- <location filename="src/MainWindow.cpp" line="1985"/>
+ <location filename="src/MainWindow.cpp" line="2225"/>
+ <location filename="src/MainWindow.cpp" line="2274"/>
+ <location filename="src/MainWindow.cpp" line="2400"/>
<source>History</source>
<translation>履歴</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="1920"/>
+ <location filename="src/MainWindow.cpp" line="2154"/>
<source>Revert</source>
<translation>変更を破棄する</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="1921"/>
+ <location filename="src/MainWindow.cpp" line="1847"/>
+ <source>Failed to commit</source>
+ <translation>コミット失敗</translation>
+ </message>
+ <message>
+ <location filename="src/MainWindow.cpp" line="1946"/>
+ <source>No remote repository is registered.</source>
+ <translation>リモートリポジトリが登録されていません。</translation>
+ </message>
+ <message>
+ <location filename="src/MainWindow.cpp" line="1968"/>
+ <source>The current branch %1 has no upstream branch.</source>
+ <translation>現在のブランチ「%1」には上流ブランチがありません。</translation>
+ </message>
+ <message>
+ <location filename="src/MainWindow.cpp" line="1971"/>
+ <source>You try push --set-upstream</source>
+ <translation>--set-upstream を試してください</translation>
+ </message>
+ <message>
+ <location filename="src/MainWindow.cpp" line="1977"/>
+ <location filename="src/MainWindow.cpp" line="4203"/>
+ <source>Connection refused.</source>
+ <translation>接続が拒否されました</translation>
+ </message>
+ <message>
+ <location filename="src/MainWindow.cpp" line="2026"/>
+ <source>&Property</source>
+ <translation>プロパティ(&P)</translation>
+ </message>
+ <message>
+ <location filename="src/MainWindow.cpp" line="2148"/>
+ <source>Checkout/Branch...</source>
+ <translation>チェックアウト/ブランチ...</translation>
+ </message>
+ <message>
+ <location filename="src/MainWindow.cpp" line="2150"/>
+ <source>Merge</source>
+ <translation>マージ</translation>
+ </message>
+ <message>
+ <location filename="src/MainWindow.cpp" line="2151"/>
+ <source>Cherry-pick</source>
+ <translation>チェリーピック</translation>
+ </message>
+ <message>
+ <location filename="src/MainWindow.cpp" line="2224"/>
+ <location filename="src/MainWindow.cpp" line="2273"/>
+ <source>Untrack</source>
+ <translation>追跡しない</translation>
+ </message>
+ <message>
+ <location filename="src/MainWindow.cpp" line="2226"/>
+ <location filename="src/MainWindow.cpp" line="2275"/>
+ <location filename="src/MainWindow.cpp" line="2401"/>
+ <source>Blame</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="src/MainWindow.cpp" line="2234"/>
+ <source>Delete selected files.</source>
+ <translation>選択されたファイルを削除します。</translation>
+ </message>
+ <message>
+ <location filename="src/MainWindow.cpp" line="2245"/>
+ <source>rm --cached files</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="src/MainWindow.cpp" line="2270"/>
+ <source>Reset</source>
+ <translation>リセット</translation>
+ </message>
+ <message>
+ <location filename="src/MainWindow.cpp" line="2271"/>
<source>Ignore</source>
<translation>無視する</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="1922"/>
+ <location filename="src/MainWindow.cpp" line="2440"/>
+ <source>Reset a file</source>
+ <translation>ファイルをリセットします</translation>
+ </message>
+ <message>
+ <location filename="src/MainWindow.cpp" line="4129"/>
+ <source>No repository selected</source>
+ <translation>リポジトリが選択されていません</translation>
+ </message>
+ <message>
+ <location filename="src/MainWindow.cpp" line="2223"/>
+ <location filename="src/MainWindow.cpp" line="2272"/>
<source>Delete</source>
<translation>削除</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="2006"/>
+ <location filename="src/MainWindow.cpp" line="2424"/>
<source>Are you sure you want to run the following command ?</source>
<translation>次のコマンドを実行してよろしいですか?</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="2021"/>
<source>Revert a file</source>
- <translation>ファイルの変更を破棄</translation>
+ <translation type="vanished">ファイルの変更を破棄</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="2036"/>
+ <location filename="src/MainWindow.cpp" line="2455"/>
<source>Revert all files</source>
<translation>すべてのファイルの変更を破棄</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="2598"/>
+ <location filename="src/MainWindow.cpp" line="3086"/>
<source>Select %1 command</source>
<translation>%1 コマンドの選択</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="2879"/>
+ <location filename="src/MainWindow.cpp" line="3382"/>
<source>A file with same name already exists</source>
<translation>同じ名前のファイルが既に存在しています</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="2884"/>
+ <location filename="src/MainWindow.cpp" line="3387"/>
<source>A folder with same name already exists</source>
<translation>同じ名前のフォルダが既に存在しています</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="2901"/>
+ <location filename="src/MainWindow.cpp" line="3404"/>
<source>Invalid folder</source>
<translation>無効なフォルダ</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="2906"/>
+ <location filename="src/MainWindow.cpp" line="3409"/>
<source>No such folder. Create it now ?</source>
<translation>このフォルダはありません。作成しますか?</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="2919"/>
<source>Cloning is in progress</source>
- <translation>クローン中</translation>
+ <translation type="vanished">クローン中</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="3204"/>
+ <location filename="src/MainWindow.cpp" line="3802"/>
<source>The URL is a valid repository</source>
<translation>このURLは有効なリポジトリです</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="3205"/>
+ <location filename="src/MainWindow.cpp" line="3803"/>
<source>Failed to access the URL</source>
<translation>このURLへのアクセスに失敗しました</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="3210"/>
+ <location filename="src/MainWindow.cpp" line="3808"/>
<source>Remote Repository</source>
<translation>リモートリポジトリ</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="3307"/>
+ <location filename="src/MainWindow.cpp" line="3945"/>
<source>Jump</source>
<translation>移動</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="3307"/>
+ <location filename="src/MainWindow.cpp" line="3945"/>
<source>That commmit has not foud or not read yet</source>
<translation>そのコミットは、見つからないか、まだ読み込まれていません。</translation>
</message>
<message>
- <location filename="src/MainWindow.cpp" line="3402"/>
+ <location filename="src/MainWindow.cpp" line="4067"/>
<source>Failed to delete the branch '%1'
</source>
<translation>ブランチの削除に失敗しました : '%1'</translation>
</message>
</context>
<context>
<name>MergeBranchDialog</name>
<message>
<location filename="src/MergeBranchDialog.ui" line="14"/>
<source>Merge</source>
<translation>マージ</translation>
</message>
<message>
<location filename="src/MergeBranchDialog.ui" line="26"/>
<source>Current branch :</source>
<translation>現在のブランチ</translation>
</message>
<message>
<location filename="src/MergeBranchDialog.ui" line="39"/>
<source>TextLabel</source>
<translation></translation>
</message>
<message>
<location filename="src/MergeBranchDialog.ui" line="62"/>
<source>OK</source>
<translation></translation>
</message>
<message>
<location filename="src/MergeBranchDialog.ui" line="75"/>
<source>Cancel</source>
<translation>キャンセル</translation>
</message>
</context>
<context>
- <name>NewBranchDialog</name>
+ <name>MyImageViewWidget</name>
<message>
- <location filename="src/NewBranchDialog.ui" line="14"/>
- <source>New branch</source>
- <translation>新しいブランチ</translation>
+ <location filename="src/MyImageViewWidget.cpp" line="35"/>
+ <source>Save as...</source>
+ <translation>名前を付けて保存...</translation>
</message>
<message>
- <location filename="src/NewBranchDialog.ui" line="52"/>
- <source>OK</source>
- <translation></translation>
+ <location filename="src/MyImageViewWidget.cpp" line="42"/>
+ <source>Save as</source>
+ <translation>名前を付けて保存</translation>
</message>
+</context>
+<context>
+ <name>MyTextEditorWidget</name>
<message>
- <location filename="src/NewBranchDialog.ui" line="59"/>
- <source>Cancel</source>
- <translation>キャンセル</translation>
+ <location filename="src/MyTextEditorWidget.cpp" line="35"/>
+ <source>Save as...</source>
+ <translation>名前を付けて保存...</translation>
+ </message>
+ <message>
+ <location filename="src/MyTextEditorWidget.cpp" line="36"/>
+ <source>Copy</source>
+ <translation>コピー</translation>
+ </message>
+ <message>
+ <location filename="src/MyTextEditorWidget.cpp" line="43"/>
+ <source>Save as</source>
+ <translation>名前を付けて保存</translation>
</message>
</context>
<context>
- <name>ProgressDialog</name>
+ <name>NewBranchDialog</name>
<message>
- <location filename="src/ProgressDialog.ui" line="14"/>
- <source>Dialog</source>
- <translation></translation>
+ <source>New branch</source>
+ <translation type="vanished">新しいブランチ</translation>
</message>
<message>
- <location filename="src/ProgressDialog.ui" line="59"/>
- <location filename="src/ProgressDialog.ui" line="106"/>
- <source>TextLabel</source>
- <translation></translation>
+ <source>Cancel</source>
+ <translation type="vanished">キャンセル</translation>
</message>
+</context>
+<context>
+ <name>ProgressDialog</name>
<message>
- <location filename="src/ProgressDialog.cpp" line="43"/>
<source>Press Esc key to abort the process</source>
- <translation>Escキーを押すと中止します</translation>
+ <translation type="vanished">Escキーを押すと中止します</translation>
</message>
<message>
- <location filename="src/ProgressDialog.cpp" line="45"/>
<source>Press Esc key %1 times to abort the process</source>
- <translation>Escキーを %1 回押すと中止します</translation>
+ <translation type="vanished">Escキーを %1 回押すと中止します</translation>
</message>
</context>
<context>
<name>PushDialog</name>
<message>
<location filename="src/PushDialog.ui" line="14"/>
<source>Push</source>
<translation>プッシュ</translation>
</message>
+ <message>
+ <location filename="src/PushDialog.ui" line="20"/>
+ <source>push --set-upstream</source>
+ <translation></translation>
+ </message>
<message>
<location filename="src/PushDialog.ui" line="26"/>
- <source>Username</source>
- <translation>ユーザー名</translation>
+ <source>Remote</source>
+ <translation>リモート</translation>
</message>
<message>
- <location filename="src/PushDialog.ui" line="39"/>
- <source>Password</source>
- <translation>パスワード</translation>
+ <location filename="src/PushDialog.ui" line="33"/>
+ <source>Branch</source>
+ <translation>ブランチ</translation>
</message>
<message>
- <location filename="src/PushDialog.ui" line="82"/>
- <source>URL</source>
+ <location filename="src/PushDialog.ui" line="64"/>
+ <source>OK</source>
<translation></translation>
</message>
-</context>
-<context>
- <name>RemoteRepositoriesTableWidget</name>
<message>
- <location filename="src/RemoteRepositoriesTableWidget.cpp" line="27"/>
- <source>Copy URL</source>
- <translation>URLをコピー</translation>
+ <location filename="src/PushDialog.ui" line="71"/>
+ <source>Cancel</source>
+ <translation>キャンセル</translation>
</message>
-</context>
-<context>
- <name>RepositoryPropertyDialog</name>
<message>
- <location filename="src/RepositoryPropertyDialog.ui" line="14"/>
- <source>Repository Properties</source>
+ <source>Username</source>
+ <translation type="vanished">ユーザー名</translation>
+ </message>
+ <message>
+ <source>Password</source>
+ <translation type="vanished">パスワード</translation>
+ </message>
+</context>
+<context>
+ <name>ReflogWindow</name>
+ <message>
+ <location filename="src/ReflogWindow.ui" line="14"/>
+ <source>Reflog</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="src/ReflogWindow.ui" line="57"/>
+ <source>Close</source>
+ <translation>閉じる</translation>
+ </message>
+ <message>
+ <location filename="src/ReflogWindow.cpp" line="35"/>
+ <source>Commit</source>
+ <translation>コミット</translation>
+ </message>
+ <message>
+ <location filename="src/ReflogWindow.cpp" line="36"/>
+ <source>Head</source>
+ <translation>ヘッド</translation>
+ </message>
+ <message>
+ <location filename="src/ReflogWindow.cpp" line="37"/>
+ <source>Command</source>
+ <translation>コマンド</translation>
+ </message>
+ <message>
+ <location filename="src/ReflogWindow.cpp" line="38"/>
+ <source>Comment</source>
+ <translation>コメント</translation>
+ </message>
+ <message>
+ <location filename="src/ReflogWindow.cpp" line="98"/>
+ <source>Checkout</source>
+ <translation>チェックアウト</translation>
+ </message>
+ <message>
+ <location filename="src/ReflogWindow.cpp" line="99"/>
+ <source>Explorer</source>
+ <translation>エクスプローラ</translation>
+ </message>
+</context>
+<context>
+ <name>RemoteRepositoriesTableWidget</name>
+ <message>
+ <location filename="src/RemoteRepositoriesTableWidget.cpp" line="27"/>
+ <source>Copy URL</source>
+ <translation>URLをコピー</translation>
+ </message>
+</context>
+<context>
+ <name>RepositoryPropertyDialog</name>
+ <message>
+ <location filename="src/RepositoryPropertyDialog.ui" line="14"/>
+ <source>Repository Property</source>
+ <oldsource>Repository Properties</oldsource>
<translation>リポジトリのプロパティ</translation>
</message>
<message>
- <location filename="src/RepositoryPropertyDialog.ui" line="66"/>
+ <location filename="src/RepositoryPropertyDialog.ui" line="65"/>
<source>TextLabel</source>
<translation></translation>
</message>
<message>
- <location filename="src/RepositoryPropertyDialog.ui" line="87"/>
+ <location filename="src/RepositoryPropertyDialog.ui" line="92"/>
<source>Local dir :</source>
<translation>ローカルフォルダ</translation>
</message>
<message>
- <location filename="src/RepositoryPropertyDialog.ui" line="106"/>
+ <location filename="src/RepositoryPropertyDialog.ui" line="111"/>
<source>Remote URLs</source>
<translation>リモートURL</translation>
</message>
<message>
- <location filename="src/RepositoryPropertyDialog.ui" line="131"/>
+ <location filename="src/RepositoryPropertyDialog.ui" line="121"/>
+ <source>Remote</source>
+ <translation>リモート</translation>
+ </message>
+ <message>
+ <location filename="src/RepositoryPropertyDialog.ui" line="127"/>
+ <source>Add</source>
+ <translation>追加</translation>
+ </message>
+ <message>
+ <location filename="src/RepositoryPropertyDialog.ui" line="134"/>
+ <source>Edit</source>
+ <translation>編集</translation>
+ </message>
+ <message>
+ <location filename="src/RepositoryPropertyDialog.ui" line="154"/>
+ <source>Remove</source>
+ <translation>削除</translation>
+ </message>
+ <message>
+ <location filename="src/RepositoryPropertyDialog.ui" line="166"/>
+ <source>&Remote menu</source>
+ <translation>リモートメニュー(&R)</translation>
+ </message>
+ <message>
+ <location filename="src/RepositoryPropertyDialog.ui" line="186"/>
<source>Close</source>
<translation>閉じる</translation>
</message>
+ <message>
+ <location filename="src/RepositoryPropertyDialog.cpp" line="128"/>
+ <source>Confirm Remove</source>
+ <translation>削除の確認</translation>
+ </message>
+ <message>
+ <location filename="src/RepositoryPropertyDialog.cpp" line="128"/>
+ <source>Are you sure you want to remove the remote '%1' from the repository '%2' ?</source>
+ <translation>リポジトリ「%2」からリモート「%1」を削除してよろしいですか?</translation>
+ </message>
</context>
<context>
<name>SearchFromGitHubDialog</name>
<message>
<location filename="src/SearchFromGitHubDialog.ui" line="14"/>
<source>Search From GitHub</source>
<translation>GitHubから検索</translation>
</message>
<message>
<location filename="src/SearchFromGitHubDialog.ui" line="25"/>
<source>Search</source>
<translation>検索</translation>
</message>
<message>
- <location filename="src/SearchFromGitHubDialog.ui" line="69"/>
+ <location filename="src/SearchFromGitHubDialog.ui" line="75"/>
<source>ssh</source>
<translation></translation>
</message>
<message>
- <location filename="src/SearchFromGitHubDialog.ui" line="79"/>
+ <location filename="src/SearchFromGitHubDialog.ui" line="85"/>
<source>http</source>
<translation></translation>
</message>
<message>
- <location filename="src/SearchFromGitHubDialog.ui" line="106"/>
+ <location filename="src/SearchFromGitHubDialog.ui" line="112"/>
<source>OK</source>
<translation></translation>
</message>
<message>
- <location filename="src/SearchFromGitHubDialog.ui" line="113"/>
+ <location filename="src/SearchFromGitHubDialog.ui" line="119"/>
<source>Cancel</source>
<translation>キャンセル</translation>
</message>
<message>
- <location filename="src/SearchFromGitHubDialog.cpp" line="121"/>
+ <location filename="src/SearchFromGitHubDialog.cpp" line="58"/>
<source>Name</source>
<translation>名前</translation>
</message>
<message>
- <location filename="src/SearchFromGitHubDialog.cpp" line="122"/>
+ <location filename="src/SearchFromGitHubDialog.cpp" line="59"/>
<source>Owner</source>
<translation>オーナー</translation>
</message>
<message>
- <location filename="src/SearchFromGitHubDialog.cpp" line="123"/>
+ <location filename="src/SearchFromGitHubDialog.cpp" line="60"/>
<source>Score</source>
<translation>スコア</translation>
</message>
<message>
- <location filename="src/SearchFromGitHubDialog.cpp" line="124"/>
+ <location filename="src/SearchFromGitHubDialog.cpp" line="61"/>
<source>Description</source>
<translation>概要</translation>
</message>
</context>
<context>
<name>SelectCommandDialog</name>
<message>
<location filename="src/SelectCommandDialog.ui" line="14"/>
<source>Select git command</source>
<translation>git コマンドの選択</translation>
</message>
<message>
<location filename="src/SelectCommandDialog.ui" line="20"/>
<source>TextLabel</source>
<translation></translation>
</message>
<message>
<location filename="src/SelectCommandDialog.ui" line="32"/>
<source>&Browse...</source>
<translation>参照(&B)...</translation>
</message>
<message>
<location filename="src/SelectCommandDialog.ui" line="52"/>
<source>OK</source>
<translation></translation>
</message>
<message>
<location filename="src/SelectCommandDialog.ui" line="59"/>
<source>Cancel</source>
<translation>キャンセル</translation>
</message>
<message>
<location filename="src/SelectCommandDialog.cpp" line="29"/>
<source>Please select the '%1' command you want to use.</source>
<translation>使用したい '%1' コマンドを選択してください。</translation>
</message>
<message>
- <location filename="src/SelectCommandDialog.cpp" line="54"/>
+ <location filename="src/SelectCommandDialog.cpp" line="58"/>
+ <location filename="src/SelectCommandDialog.cpp" line="65"/>
+ <source>%1 command (%2);;</source>
+ <translation>%1 コマンド (%2);;</translation>
+ </message>
+ <message>
+ <location filename="src/SelectCommandDialog.cpp" line="60"/>
+ <source>Executable files (*.exe)</source>
+ <translation>実行可能ファイル (*.exe)</translation>
+ </message>
+ <message>
<source>%1 command (%2);;Executable files (*.exe)</source>
- <translation>%1 コマンド (%2);;実行可能ファイル (*.exe)</translation>
+ <translation type="vanished">%1 コマンド (%2);;実行可能ファイル (*.exe)</translation>
</message>
<message>
- <location filename="src/SelectCommandDialog.cpp" line="56"/>
<source>%1 command (%2);;All files (*)</source>
- <translation>%1 コマンド (%2);;すべてのファイル (*)</translation>
+ <translation type="vanished">%1 コマンド (%2);;すべてのファイル (*)</translation>
</message>
<message>
- <location filename="src/SelectCommandDialog.cpp" line="61"/>
+ <location filename="src/SelectCommandDialog.cpp" line="71"/>
<source>%1 command</source>
<translation>%1 コマンド</translation>
</message>
</context>
+<context>
+ <name>SelectGpgKeyDialog</name>
+ <message>
+ <location filename="src/SelectGpgKeyDialog.ui" line="14"/>
+ <source>Select GPG Key</source>
+ <translation>GPGキーの選択</translation>
+ </message>
+ <message>
+ <location filename="src/SelectGpgKeyDialog.ui" line="57"/>
+ <source>OK</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="src/SelectGpgKeyDialog.ui" line="64"/>
+ <source>Cancel</source>
+ <translation>キャンセル</translation>
+ </message>
+ <message>
+ <location filename="src/SelectGpgKeyDialog.cpp" line="31"/>
+ <source>ID</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="src/SelectGpgKeyDialog.cpp" line="32"/>
+ <source>Name</source>
+ <translation>名前</translation>
+ </message>
+ <message>
+ <location filename="src/SelectGpgKeyDialog.cpp" line="33"/>
+ <source>Mail</source>
+ <translation>メール</translation>
+ </message>
+</context>
+<context>
+ <name>SetGlobalUserDialog</name>
+ <message>
+ <location filename="src/SetGlobalUserDialog.ui" line="14"/>
+ <source>Global User Setting</source>
+ <translation>グローバルユーザー設定</translation>
+ </message>
+ <message>
+ <location filename="src/SetGlobalUserDialog.ui" line="28"/>
+ <source>Name</source>
+ <translation>名前</translation>
+ </message>
+ <message>
+ <location filename="src/SetGlobalUserDialog.ui" line="38"/>
+ <source>Mail</source>
+ <translation>メール</translation>
+ </message>
+ <message>
+ <location filename="src/SetGlobalUserDialog.ui" line="65"/>
+ <source>OK</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="src/SetGlobalUserDialog.ui" line="75"/>
+ <source>Skip</source>
+ <translation>スキップ</translation>
+ </message>
+</context>
+<context>
+ <name>SetGpgSigningDialog</name>
+ <message>
+ <location filename="src/SetGpgSigningDialog.ui" line="14"/>
+ <source>Set GPG Signing</source>
+ <translation>GPG署名の指定</translation>
+ </message>
+ <message>
+ <location filename="src/SetGpgSigningDialog.ui" line="26"/>
+ <source>Global</source>
+ <translation>グローバル</translation>
+ </message>
+ <message>
+ <location filename="src/SetGpgSigningDialog.ui" line="39"/>
+ <location filename="src/SetGpgSigningDialog.cpp" line="29"/>
+ <source>Repository</source>
+ <translation>リポジトリ</translation>
+ </message>
+ <message>
+ <location filename="src/SetGpgSigningDialog.ui" line="55"/>
+ <source>ID</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="src/SetGpgSigningDialog.ui" line="65"/>
+ <source>Name</source>
+ <translation>名前</translation>
+ </message>
+ <message>
+ <location filename="src/SetGpgSigningDialog.ui" line="75"/>
+ <source>Mail</source>
+ <translation>メール</translation>
+ </message>
+ <message>
+ <location filename="src/SetGpgSigningDialog.ui" line="87"/>
+ <source>Select</source>
+ <translation>選択</translation>
+ </message>
+ <message>
+ <location filename="src/SetGpgSigningDialog.ui" line="107"/>
+ <source>Clear</source>
+ <translation>消去</translation>
+ </message>
+ <message>
+ <location filename="src/SetGpgSigningDialog.ui" line="121"/>
+ <source>Configure...</source>
+ <translation>設定...</translation>
+ </message>
+ <message>
+ <location filename="src/SetGpgSigningDialog.ui" line="141"/>
+ <source>OK</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="src/SetGpgSigningDialog.ui" line="148"/>
+ <source>Cancel</source>
+ <translation>キャンセル</translation>
+ </message>
+</context>
<context>
<name>SetRemoteUrlDialog</name>
<message>
<location filename="src/SetRemoteUrlDialog.ui" line="14"/>
<source>Set Remote URL</source>
<translation>リモートURLの設定</translation>
</message>
<message>
<location filename="src/SetRemoteUrlDialog.ui" line="20"/>
<source>Current URLs</source>
<translation>現在のURL</translation>
</message>
<message>
<location filename="src/SetRemoteUrlDialog.ui" line="30"/>
<source>New URL</source>
<translation>新しいURL</translation>
</message>
<message>
<location filename="src/SetRemoteUrlDialog.ui" line="36"/>
+ <source>Name</source>
+ <translation>名前</translation>
+ </message>
+ <message>
+ <location filename="src/SetRemoteUrlDialog.ui" line="91"/>
+ <source>OK</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="src/SetRemoteUrlDialog.ui" line="98"/>
+ <source>Cancel</source>
+ <translation>キャンセル</translation>
+ </message>
+ <message>
<source>Remote</source>
- <translation>リモート</translation>
+ <translation type="vanished">リモート</translation>
</message>
<message>
<location filename="src/SetRemoteUrlDialog.ui" line="43"/>
<source>URL</source>
<translation></translation>
</message>
<message>
<location filename="src/SetRemoteUrlDialog.ui" line="63"/>
<source>&Test</source>
<translation>テスト(&T)</translation>
</message>
<message>
- <location filename="src/SetRemoteUrlDialog.ui" line="91"/>
<source>&Apply</source>
- <translation>適用(&A)</translation>
+ <translation type="vanished">適用(&A)</translation>
</message>
<message>
- <location filename="src/SetRemoteUrlDialog.ui" line="98"/>
<source>&Close</source>
- <translation>閉じる(&C)</translation>
+ <translation type="vanished">閉じる(&C)</translation>
</message>
<message>
<source>Purpose</source>
<oldsource>Porpose</oldsource>
<translation type="vanished">用途</translation>
</message>
<message>
<source>Origin</source>
<translation type="vanished">オリジン</translation>
</message>
</context>
<context>
<name>SetUserDialog</name>
<message>
<location filename="src/SetUserDialog.ui" line="14"/>
<source>Set User</source>
<translation>ユーザーの設定</translation>
</message>
<message>
<location filename="src/SetUserDialog.ui" line="20"/>
<source>Global</source>
<translation>グローバル</translation>
</message>
<message>
<location filename="src/SetUserDialog.ui" line="27"/>
- <location filename="src/SetUserDialog.cpp" line="22"/>
+ <location filename="src/SetUserDialog.cpp" line="31"/>
<source>Repository</source>
<translation>リポジトリ</translation>
</message>
<message>
- <location filename="src/SetUserDialog.ui" line="36"/>
+ <location filename="src/SetUserDialog.ui" line="42"/>
<source>Name</source>
<translation>名前</translation>
</message>
<message>
- <location filename="src/SetUserDialog.ui" line="46"/>
+ <location filename="src/SetUserDialog.ui" line="52"/>
<source>Mail</source>
<translation>メール</translation>
</message>
<message>
- <location filename="src/SetUserDialog.ui" line="73"/>
+ <location filename="src/SetUserDialog.ui" line="66"/>
+ <source>Get icon from Gravatar</source>
+ <translation>Gravatarからアイコンを取得</translation>
+ </message>
+ <message>
+ <location filename="src/SetUserDialog.ui" line="128"/>
<source>OK</source>
<translation></translation>
</message>
<message>
- <location filename="src/SetUserDialog.ui" line="83"/>
+ <location filename="src/SetUserDialog.ui" line="138"/>
<source>Cancel</source>
<translation>キャンセル</translation>
</message>
</context>
+<context>
+ <name>SettingBehaviorForm</name>
+ <message>
+ <location filename="src/SettingBehaviorForm.ui" line="14"/>
+ <source>Behavior</source>
+ <translation>動作</translation>
+ </message>
+ <message>
+ <location filename="src/SettingBehaviorForm.ui" line="20"/>
+ <source>Automatically fetch when opening the repository</source>
+ <translation>リポジトリを開くとき自動的にフェッチする</translation>
+ </message>
+ <message>
+ <location filename="src/SettingBehaviorForm.ui" line="27"/>
+ <source>Get committer's icon from gravatar.com</source>
+ <translation>gravatar.comからアイコンを取得する</translation>
+ </message>
+ <message>
+ <location filename="src/SettingBehaviorForm.ui" line="36"/>
+ <source>Maximum number of commit item acquisitions</source>
+ <translation>取得するコミット情報の最大個数</translation>
+ </message>
+ <message>
+ <location filename="src/SettingBehaviorForm.ui" line="69"/>
+ <source>GPG Signing Policy</source>
+ <translation>GPG署名ポリシー</translation>
+ </message>
+ <message>
+ <location filename="src/SettingBehaviorForm.ui" line="76"/>
+ <source>Configure...</source>
+ <translation>設定...</translation>
+ </message>
+</context>
+<context>
+ <name>SettingExampleForm</name>
+ <message>
+ <location filename="src/SettingExampleForm.ui" line="14"/>
+ <source>Example</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="src/SettingExampleForm.ui" line="20"/>
+ <source>Underconstruction</source>
+ <translation></translation>
+ </message>
+</context>
+<context>
+ <name>SettingGeneralForm</name>
+ <message>
+ <location filename="src/SettingGeneralForm.ui" line="14"/>
+ <source>General</source>
+ <translation>一般</translation>
+ </message>
+ <message>
+ <location filename="src/SettingGeneralForm.ui" line="20"/>
+ <source>Remember and restore window position</source>
+ <translation>ウィンドウの位置を記憶と復元する</translation>
+ </message>
+ <message>
+ <location filename="src/SettingGeneralForm.ui" line="27"/>
+ <source>Enable high DPI scaling</source>
+ <translation>高精細画面のスケーリングを行う</translation>
+ </message>
+ <message>
+ <location filename="src/SettingGeneralForm.ui" line="34"/>
+ <location filename="src/SettingGeneralForm.cpp" line="45"/>
+ <source>Default working folder</source>
+ <translation>既定の作業フォルダ</translation>
+ </message>
+ <message>
+ <location filename="src/SettingGeneralForm.ui" line="43"/>
+ <source>Browse...</source>
+ <translation>参照...</translation>
+ </message>
+ <message>
+ <location filename="src/SettingGeneralForm.ui" line="53"/>
+ <source>Theme</source>
+ <translation>テーマ</translation>
+ </message>
+ <message>
+ <location filename="src/SettingGeneralForm.ui" line="59"/>
+ <source>Standard</source>
+ <translation>標準</translation>
+ </message>
+ <message>
+ <location filename="src/SettingGeneralForm.ui" line="66"/>
+ <source>Dark</source>
+ <translation>ダーク</translation>
+ </message>
+ <message>
+ <location filename="src/SettingGeneralForm.ui" line="73"/>
+ <source>(Changes are applied at next run)</source>
+ <translation>(設定は次の実行時に有効になります)</translation>
+ </message>
+</context>
+<context>
+ <name>SettingNetworkForm</name>
+ <message>
+ <location filename="src/SettingNetworkForm.ui" line="14"/>
+ <source>Network</source>
+ <translation>ネットワーク</translation>
+ </message>
+ <message>
+ <location filename="src/SettingNetworkForm.ui" line="20"/>
+ <source>Proxy Server</source>
+ <translation>プロキシサーバー</translation>
+ </message>
+ <message>
+ <location filename="src/SettingNetworkForm.ui" line="26"/>
+ <source>No Proxy</source>
+ <translation>プロキシなし</translation>
+ </message>
+ <message>
+ <location filename="src/SettingNetworkForm.ui" line="33"/>
+ <source>Auto Detect</source>
+ <translation>自動検出</translation>
+ </message>
+ <message>
+ <location filename="src/SettingNetworkForm.ui" line="40"/>
+ <source>Manual</source>
+ <translation>手動</translation>
+ </message>
+</context>
+<context>
+ <name>SettingProgramsForm</name>
+ <message>
+ <location filename="src/SettingProgramsForm.ui" line="14"/>
+ <source>Programs</source>
+ <translation>プログラム</translation>
+ </message>
+ <message>
+ <location filename="src/SettingProgramsForm.ui" line="20"/>
+ <source>Git command</source>
+ <translation>Git コマンド</translation>
+ </message>
+ <message>
+ <location filename="src/SettingProgramsForm.ui" line="29"/>
+ <location filename="src/SettingProgramsForm.ui" line="48"/>
+ <location filename="src/SettingProgramsForm.ui" line="67"/>
+ <source>Browse...</source>
+ <translation>参照...</translation>
+ </message>
+ <message>
+ <location filename="src/SettingProgramsForm.ui" line="39"/>
+ <source>File command</source>
+ <translation>File コマンド</translation>
+ </message>
+ <message>
+ <location filename="src/SettingProgramsForm.ui" line="58"/>
+ <source>GPG command (option)</source>
+ <translation>GPGコマンド(オプション)</translation>
+ </message>
+</context>
<context>
<name>SettingsDialog</name>
<message>
<location filename="src/SettingsDialog.ui" line="14"/>
<source>Settings</source>
<translation>設定</translation>
</message>
<message>
- <location filename="src/SettingsDialog.ui" line="53"/>
<source>Git command</source>
- <translation>Git コマンド</translation>
+ <translation type="vanished">Git コマンド</translation>
</message>
<message>
- <location filename="src/SettingsDialog.ui" line="62"/>
- <location filename="src/SettingsDialog.ui" line="81"/>
- <location filename="src/SettingsDialog.ui" line="100"/>
<source>Browse...</source>
- <translation>参照...</translation>
+ <translation type="vanished">参照...</translation>
</message>
<message>
- <location filename="src/SettingsDialog.ui" line="72"/>
<source>File command</source>
- <translation>File コマンド</translation>
+ <translation type="vanished">File コマンド</translation>
</message>
<message>
- <location filename="src/SettingsDialog.ui" line="91"/>
- <location filename="src/SettingsDialog.cpp" line="84"/>
<source>Default working folder</source>
- <translation>既定の作業フォルダ</translation>
+ <translation type="vanished">既定の作業フォルダ</translation>
</message>
<message>
- <location filename="src/SettingsDialog.ui" line="145"/>
+ <location filename="src/SettingsDialog.ui" line="141"/>
<source>OK</source>
<translation></translation>
</message>
<message>
- <location filename="src/SettingsDialog.ui" line="152"/>
+ <location filename="src/SettingsDialog.ui" line="148"/>
<source>Cancel</source>
<translation>キャンセル</translation>
</message>
</context>
<context>
<name>TextEditDialog</name>
<message>
<location filename="src/TextEditDialog.ui" line="14"/>
<source>Dialog</source>
<translation></translation>
</message>
<message>
<location filename="src/TextEditDialog.ui" line="48"/>
<source>OK</source>
<translation></translation>
</message>
<message>
<location filename="src/TextEditDialog.ui" line="58"/>
<source>Cancel</source>
<translation>キャンセル</translation>
</message>
</context>
+<context>
+ <name>WelcomeWizardDialog</name>
+ <message>
+ <location filename="src/WelcomeWizardDialog.ui" line="14"/>
+ <source>Welcome to the Guitar Wizard</source>
+ <translation>Guitarウィザードへようこそ</translation>
+ </message>
+ <message>
+ <location filename="src/WelcomeWizardDialog.ui" line="45"/>
+ <source>Helper Tools</source>
+ <translation>ヘルパープログラム</translation>
+ </message>
+ <message>
+ <location filename="src/WelcomeWizardDialog.ui" line="61"/>
+ <location filename="src/WelcomeWizardDialog.ui" line="332"/>
+ <source>git</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="src/WelcomeWizardDialog.ui" line="71"/>
+ <location filename="src/WelcomeWizardDialog.ui" line="88"/>
+ <location filename="src/WelcomeWizardDialog.ui" line="242"/>
+ <source>Browse</source>
+ <translation>参照</translation>
+ </message>
+ <message>
+ <location filename="src/WelcomeWizardDialog.ui" line="78"/>
+ <location filename="src/WelcomeWizardDialog.ui" line="346"/>
+ <source>file</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="src/WelcomeWizardDialog.ui" line="120"/>
+ <source>Global User Information</source>
+ <translation>グローバルユーザー情報</translation>
+ </message>
+ <message>
+ <location filename="src/WelcomeWizardDialog.ui" line="136"/>
+ <source>git config --global user.name</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="src/WelcomeWizardDialog.ui" line="146"/>
+ <source>git config --global user.email</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="src/WelcomeWizardDialog.ui" line="162"/>
+ <source>Get icon from Gravatar</source>
+ <translation>Gravatarからアイコンを取得</translation>
+ </message>
+ <message>
+ <location filename="src/WelcomeWizardDialog.ui" line="216"/>
+ <location filename="src/WelcomeWizardDialog.cpp" line="156"/>
+ <source>Default Working Folder</source>
+ <translation>規定の作業フォルダ</translation>
+ </message>
+ <message>
+ <location filename="src/WelcomeWizardDialog.ui" line="232"/>
+ <location filename="src/WelcomeWizardDialog.ui" line="318"/>
+ <source>folder</source>
+ <translation>フォルダ</translation>
+ </message>
+ <message>
+ <location filename="src/WelcomeWizardDialog.ui" line="274"/>
+ <source>Ready to play the Guitar !</source>
+ <translation>Guitarの準備ができました!</translation>
+ </message>
+ <message>
+ <location filename="src/WelcomeWizardDialog.ui" line="290"/>
+ <source>user</source>
+ <translation>ユーザー</translation>
+ </message>
+ <message>
+ <location filename="src/WelcomeWizardDialog.ui" line="304"/>
+ <source>email</source>
+ <translation>メール</translation>
+ </message>
+ <message>
+ <location filename="src/WelcomeWizardDialog.ui" line="420"/>
+ <location filename="src/WelcomeWizardDialog.cpp" line="148"/>
+ <source><< Prev</source>
+ <translation><< 戻る</translation>
+ </message>
+ <message>
+ <location filename="src/WelcomeWizardDialog.ui" line="427"/>
+ <location filename="src/WelcomeWizardDialog.cpp" line="149"/>
+ <source>Next >></source>
+ <translation>次へ >></translation>
+ </message>
+ <message>
+ <location filename="src/WelcomeWizardDialog.cpp" line="127"/>
+ <source>Cancel</source>
+ <translation>キャンセル</translation>
+ </message>
+ <message>
+ <location filename="src/WelcomeWizardDialog.cpp" line="146"/>
+ <source>Finish</source>
+ <translation>完了</translation>
+ </message>
+</context>
</TS>
File Metadata
Details
Attached
Mime Type
text/x-diff
Expires
Mon, Jun 22, 8:05 PM (6 d, 21 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
72945
Default Alt Text
(107 KB)
Attached To
Mode
R77 Guitar
Attached
Detach File
Event Timeline