This commit is contained in:
Aya Morisawa 2017-04-04 20:45:35 +09:00
parent c04498ed3c
commit a6e31aef62
18 changed files with 31 additions and 61 deletions

View file

@ -19,12 +19,15 @@ common:
surprise: "Wow"
congrats: "Congrats!"
input-message-here: "Enter message here"
send: "Send"
delete: "Delete"
loading: "Loading"
ok: "OK"
update-available: "New version of Misskey is now available({newer}, current is {current}). Reload page to apply update."
tags:
mk-messaging-form:
placeholder: "Enter message here"
send: "Send"
attach-from-local: "Attach file from your pc"
attach-from-drive: "Attach file from the drive"
@ -35,11 +38,9 @@ common:
mk-messaging-message:
is-read: "Read"
delete: "Delete this message"
deleted: "This message has been deleted"
mk-messaging-room:
loading: "Loading"
empty: "No conversations"
resize-form: "Drag to resize"
new-message: "New message"
@ -141,7 +142,6 @@ desktop:
empty-folder: "このフォルダーは空です"
unable-to-process: "操作を完了できません"
circular-reference-detected: "移動先のフォルダーは、移動するフォルダーのサブフォルダーです。"
ok: "OK"
unhandled-error: "不明なエラー"
url-upload: "URLアップロード"
url-of-file: "アップロードしたいファイルのURL"
@ -154,7 +154,6 @@ desktop:
rename: "名前を変更"
copy-url: "URLをコピー"
download: "ダウンロード"
delete: "削除"
else-files: "その他..."
set-as-avatar: "アバターに設定"
set-as-banner: "バナーに設定"
@ -164,7 +163,6 @@ desktop:
input-new-file-name: "新しいファイル名を入力してください"
copied: "コピー完了"
copied-url-to-clipboard: "URLをクリップボードにコピーしました"
ok: "OK"
mk-drive-browser-file:
avatar: "アバター"
@ -175,14 +173,12 @@ desktop:
move-to-this-folder: "このフォルダへ移動"
show-in-new-window: "新しいウィンドウで表示"
rename: "名前を変更"
delete: "削除"
rename-folder: "フォルダ名の変更"
input-new-folder-name: "新しいフォルダ名を入力してください"
mk-drive-browser-folder:
unable-to-process: "操作を完了できません"
circular-reference-detected: "移動先のフォルダーは、移動するフォルダーのサブフォルダーです。"
ok: "OK"
unhandled-error: "不明なエラー"
mk-drive-browser-nav-folder:
@ -246,23 +242,19 @@ desktop:
title: "Recommended users"
refresh: "Show others"
no-one: "No one"
fetching: "Loading"
mk-recommended-polls-home-widget:
title: "Polls"
refresh: "Show others"
nothing: "Nothing"
fetching: "Loading"
mk-trends-home-widget:
title: "Trend"
refresh: "Show others"
nothing: "Nothing"
fetching: "Loading"
mk-photo-stream-home-widget:
title: "Photostream"
initializing: "Loading"
no-photos: "No photos"
mk-donation-home-widget:
@ -307,9 +299,6 @@ mobile:
mk-drive-page:
drive: "Drive"
mk-entrance:
ok: "OK"
mk-home:
home: "Home"
@ -354,7 +343,6 @@ mobile:
count-separator: ", "
file-count: "File(s)"
load-more: "Load more"
loading: "Loading"
nothing-in-drive: "Nothing"
folder-is-empty: "This folder is empty"
@ -367,7 +355,6 @@ mobile:
mk-notifications:
empty: "No notifications"
loading: "Loading"
mk-post-detail:
reply: "Reply"
@ -390,7 +377,6 @@ mobile:
reposted-by: "Reposted by {}"
mk-timeline:
loading: "Loading"
empty: "No posts"
load-more: "More"
@ -425,4 +411,3 @@ mobile:
all: "All"
known: "You know"
load-more: "More"
loading: "Loading"

View file

@ -19,12 +19,15 @@ common:
surprise: "わお"
congrats: "おめでとう"
input-message-here: "ここにメッセージを入力"
send: "送信"
delete: "削除"
loading: "読み込み中"
ok: "わかった"
update-available: "Misskeyの新しいバージョンがあります({newer}。現在{current}を利用中)。ページを再度読み込みすると更新が適用されます。"
tags:
mk-messaging-form:
placeholder: "ここにメッセージを入力"
send: "メッセージを送信"
attach-from-local: "PCからファイルを添付する"
attach-from-drive: "ドライブからファイルを添付する"
@ -35,11 +38,9 @@ common:
mk-messaging-message:
is-read: "既読"
delete: "メッセージを削除"
deleted: "このメッセージは削除されました"
mk-messaging-room:
loading: "読み込み中"
empty: "このユーザーと話したことはありません"
resize-form: "ドラッグしてフォームの広さを調整"
new-message: "新しいメッセージがあります"
@ -141,7 +142,6 @@ desktop:
empty-folder: "このフォルダーは空です"
unable-to-process: "操作を完了できません"
circular-reference-detected: "移動先のフォルダーは、移動するフォルダーのサブフォルダーです。"
ok: "OK"
unhandled-error: "不明なエラー"
url-upload: "URLアップロード"
url-of-file: "アップロードしたいファイルのURL"
@ -154,7 +154,6 @@ desktop:
rename: "名前を変更"
copy-url: "URLをコピー"
download: "ダウンロード"
delete: "削除"
else-files: "その他..."
set-as-avatar: "アバターに設定"
set-as-banner: "バナーに設定"
@ -164,7 +163,6 @@ desktop:
input-new-file-name: "新しいファイル名を入力してください"
copied: "コピー完了"
copied-url-to-clipboard: "URLをクリップボードにコピーしました"
ok: "OK"
mk-drive-browser-file:
avatar: "アバター"
@ -175,14 +173,12 @@ desktop:
move-to-this-folder: "このフォルダへ移動"
show-in-new-window: "新しいウィンドウで表示"
rename: "名前を変更"
delete: "削除"
rename-folder: "フォルダ名の変更"
input-new-folder-name: "新しいフォルダ名を入力してください"
mk-drive-browser-folder:
unable-to-process: "操作を完了できません"
circular-reference-detected: "移動先のフォルダーは、移動するフォルダーのサブフォルダーです。"
ok: "OK"
unhandled-error: "不明なエラー"
mk-drive-browser-nav-folder:
@ -246,23 +242,19 @@ desktop:
title: "おすすめユーザー"
refresh: "他を見る"
no-one: "いません!"
fetching: "読み込んでいます"
mk-recommended-polls-home-widget:
title: "投票"
refresh: "他を見る"
nothing: "ありません!"
fetching: "読み込んでいます"
mk-trends-home-widget:
title: "トレンド"
refresh: "他を見る"
nothing: "ありません!"
fetching: "読み込んでいます"
mk-photo-stream-home-widget:
title: "フォトストリーム"
initializing: "読み込んでいます"
no-photos: "写真はありません"
mk-donation-home-widget:
@ -307,9 +299,6 @@ mobile:
mk-drive-page:
drive: "ドライブ"
mk-entrance:
ok: "わかった"
mk-home:
home: "ホーム"
@ -354,7 +343,6 @@ mobile:
count-separator: "、"
file-count: "ファイル"
load-more: "もっと読み込む"
loading: "読み込み中"
nothing-in-drive: "ドライブには何もありません"
folder-is-empty: "このフォルダは空です"
@ -367,7 +355,6 @@ mobile:
mk-notifications:
empty: "ありません!"
loading: "読み込み中"
mk-post-detail:
reply: "返信"
@ -390,7 +377,6 @@ mobile:
reposted-by: "{}がRepost"
mk-timeline:
loading: "読み込み中"
empty: "表示するものがありません"
load-more: "もっとみる"
@ -425,4 +411,3 @@ mobile:
all: "すべて"
known: "知り合い"
load-more: "もっと"
loading: "読み込み中"

View file

@ -1,8 +1,8 @@
<mk-messaging-form>
<textarea ref="text" onkeypress={ onkeypress } onpaste={ onpaste } placeholder="%i18n:common.tags.mk-messaging-form.placeholder%"></textarea>
<textarea ref="text" onkeypress={ onkeypress } onpaste={ onpaste } placeholder="%i18n:common.input-message-here%"></textarea>
<div class="files"></div>
<mk-uploader ref="uploader"></mk-uploader>
<button class="send" onclick={ send } disabled={ sending } title="%i18n:common.tags.mk-messaging-form.send%">
<button class="send" onclick={ send } disabled={ sending } title="%i18n:common.send%">
<i class="fa fa-paper-plane" if={ !sending }></i><i class="fa fa-spinner fa-spin" if={ sending }></i>
</button>
<button class="attach-from-local" type="button" title="%i18n:common.tags.mk-messaging-form.attach-from-local%">

View file

@ -2,7 +2,7 @@
<div class="content-container">
<div class="balloon">
<p class="read" if={ message.is_me && message.is_read }>%i18n:common.tags.mk-messaging-message.is-read%</p>
<button class="delete-button" if={ message.is_me } title="%i18n:common.tags.mk-messaging-message.delete%"><img src="/assets/desktop/messaging/delete.png" alt="Delete"/></button>
<button class="delete-button" if={ message.is_me } title="%i18n:common.delete%"><img src="/assets/desktop/messaging/delete.png" alt="Delete"/></button>
<div class="content" if={ !message.is_deleted }>
<div ref="text"></div>
<div class="image" if={ message.file }><img src={ message.file.url } alt="image" title={ message.file.name }/></div>

View file

@ -1,6 +1,6 @@
<mk-messaging-room>
<div class="stream">
<p class="init" if={ init }><i class="fa fa-spinner fa-spin"></i>%i18n:common.tags.mk-messaging-room.loading%</p>
<p class="init" if={ init }><i class="fa fa-spinner fa-spin"></i>%i18n:common.loading%</p>
<p class="empty" if={ !init && messages.length == 0 }><i class="fa fa-info-circle"></i>%i18n:common.tags.mk-messaging-room.empty%</p>
<virtual each={ message, i in messages }>
<mk-messaging-message message={ message }></mk-messaging-message>

View file

@ -445,7 +445,7 @@
case 'detected-circular-definition':
dialog('<i class="fa fa-exclamation-triangle"></i>%i18n:desktop.tags.mk-drive-browser.unable-to-process%',
'%i18n:desktop.tags.mk-drive-browser.circular-reference-detected%', [{
text: '%i18n:desktop.tags.mk-drive-browser.ok%'
text: '%i18n:common.ok%'
}]);
break;
default:
@ -485,7 +485,7 @@
dialog('<i class="fa fa-check"></i>%i18n:desktop.tags.mk-drive-browser.url-upload-requested%',
'%i18n:desktop.tags.mk-drive-browser.may-take-time%', [{
text: '%i18n:desktop.tags.mk-drive-browser.ok%'
text: '%i18n:common.ok%'
}]);
});
};

View file

@ -10,7 +10,7 @@
<li><a href={ parent.file.url + '?download' } download={ parent.file.name } onclick={ parent.download }><i class="fa fa-download"></i>%i18n:desktop.tags.mk-drive-browser-file-contextmenu.download%</a></li>
<li class="separator"></li>
<li onclick={ parent.delete }>
<p><i class="fa fa-trash-o"></i>%i18n:desktop.tags.mk-drive-browser-file-contextmenu.delete%</p>
<p><i class="fa fa-trash-o"></i>%i18n:common.delete%</p>
</li>
<li class="separator"></li>
<li class="has-child">
@ -74,7 +74,7 @@
this.refs.ctx.close();
dialog('<i class="fa fa-check"></i>%i18n:desktop.tags.mk-drive-browser-file-contextmenu.copied%',
'%i18n:desktop.tags.mk-drive-browser-file-contextmenu.copied-url-to-clipboard%', [{
text: '%i18n:desktop.tags.mk-drive-browser-file-contextmenu.ok%'
text: '%i18n:common.ok%'
}]);
};

View file

@ -13,7 +13,7 @@
</li>
<li class="separator"></li>
<li onclick={ parent.delete }>
<p><i class="fa fa-trash-o"></i>%i18n:desktop.tags.mk-drive-browser-folder-contextmenu.delete%</p>
<p><i class="fa fa-trash-o"></i>%i18n:common.delete%</p>
</li>
</ul>
</mk-contextmenu>

View file

@ -147,7 +147,7 @@
case 'detected-circular-definition':
dialog('<i class="fa fa-exclamation-triangle"></i>%i18n:desktop.tags.mk-drive-browser-folder.unable-to-process%',
'%i18n:desktop.tags.mk-drive-browser-folder.circular-reference-detected%', [{
text: '%i18n:desktop.tags.mk-drive-browser-folder.ok%'
text: '%i18n:common.ok%'
}]);
break;
default:

View file

@ -1,6 +1,6 @@
<mk-photo-stream-home-widget>
<p class="title"><i class="fa fa-camera"></i>%i18n:desktop.tags.mk-photo-stream-home-widget.title%</p>
<p class="initializing" if={ initializing }><i class="fa fa-spinner fa-pulse fa-fw"></i>%i18n:desktop.tags.mk-photo-stream-home-widget.initializing%<mk-ellipsis></mk-ellipsis></p>
<p class="initializing" if={ initializing }><i class="fa fa-spinner fa-pulse fa-fw"></i>%i18n:common.loading%<mk-ellipsis></mk-ellipsis></p>
<div class="stream" if={ !initializing && images.length > 0 }>
<virtual each={ image in images }>
<div class="img" style={ 'background-image: url(' + image.url + '?thumbnail&size=256)' }></div>

View file

@ -7,7 +7,7 @@
<mk-poll post={ poll }></mk-poll>
</div>
<p class="empty" if={ !loading && poll == null }>%i18n:desktop.tags.mk-recommended-polls-home-widget.nothing%</p>
<p class="loading" if={ loading }><i class="fa fa-spinner fa-pulse fa-fw"></i>%i18n:desktop.tags.mk-recommended-polls-home-widget.fetching%<mk-ellipsis></mk-ellipsis></p>
<p class="loading" if={ loading }><i class="fa fa-spinner fa-pulse fa-fw"></i>%i18n:common.loading%<mk-ellipsis></mk-ellipsis></p>
<style>
:scope
display block

View file

@ -6,7 +6,7 @@
<p class="author"><a href="/{ post.user.username }">@{ post.user.username }</a></p>
</div>
<p class="empty" if={ !loading && post == null }>%i18n:desktop.tags.mk-trends-home-widget.nothing%</p>
<p class="loading" if={ loading }><i class="fa fa-spinner fa-pulse fa-fw"></i>%i18n:desktop.tags.mk-trends-home-widget.fetching%<mk-ellipsis></mk-ellipsis></p>
<p class="loading" if={ loading }><i class="fa fa-spinner fa-pulse fa-fw"></i>%i18n:common.loading%<mk-ellipsis></mk-ellipsis></p>
<style>
:scope
display block

View file

@ -12,7 +12,7 @@
<mk-follow-button user={ _user }></mk-follow-button>
</div>
<p class="empty" if={ !loading && users.length == 0 }>%i18n:desktop.tags.mk-user-recommendation-home-widget.no-one%</p>
<p class="loading" if={ loading }><i class="fa fa-spinner fa-pulse fa-fw"></i>%i18n:desktop.tags.mk-user-recommendation-home-widget.fetching%<mk-ellipsis></mk-ellipsis></p>
<p class="loading" if={ loading }><i class="fa fa-spinner fa-pulse fa-fw"></i>%i18n:common.loading%<mk-ellipsis></mk-ellipsis></p>
<style>
:scope
display block

View file

@ -35,7 +35,7 @@
<mk-drive-file file={ file }></mk-drive-file>
</virtual>
<button class="more" if={ moreFiles } onclick={ fetchMoreFiles }>
{ fetchingMoreFiles ? '%i18n:mobile.tags.mk-drive.loading%' : '%i18n:mobile.tags.mk-drive.load-more%' }
{ fetchingMoreFiles ? '%i18n:common.loading%' : '%i18n:mobile.tags.mk-drive.load-more%' }
</button>
</div>
<div class="empty" if={ files.length == 0 && folders.length == 0 && !fetching }>

View file

@ -6,7 +6,7 @@
</virtual>
</div>
<p class="empty" if={ notifications.length == 0 && !loading }>%i18n:mobile.tags.mk-notifications.empty%</p>
<p class="loading" if={ loading }><i class="fa fa-spinner fa-pulse fa-fw"></i>%i18n:mobile.tags.mk-notifications.loading%
<p class="loading" if={ loading }><i class="fa fa-spinner fa-pulse fa-fw"></i>%i18n:common.loading%
<mk-ellipsis></mk-ellipsis>
</p>
<style>

View file

@ -4,7 +4,7 @@
<mk-entrance-signup if={ mode == 'signup' }></mk-entrance-signup>
<div class="introduction" if={ mode == 'introduction' }>
<mk-introduction></mk-introduction>
<button onclick={ signin }>%i18n:mobile.tags.mk-entrance.ok%</button>
<button onclick={ signin }>%i18n:common.ok%</button>
</div>
</main>
<footer>

View file

@ -1,6 +1,6 @@
<mk-timeline>
<div class="init" if={ init }>
<i class="fa fa-spinner fa-pulse"></i>%i18n:mobile.tags.mk-timeline.loading%
<i class="fa fa-spinner fa-pulse"></i>%i18n:common.loading%
</div>
<div class="empty" if={ !init && posts.length == 0 }>
<i class="fa fa-comments-o"></i>{ opts.empty || '%i18n:mobile.tags.mk-timeline.empty%' }
@ -15,7 +15,7 @@
<footer if={ !init }>
<button if={ canFetchMore } onclick={ more } disabled={ fetching }>
<span if={ !fetching }>%i18n:mobile.tags.mk-timeline.load-more%</span>
<span if={ fetching }>%i18n:mobile.tags.mk-timeline.loading%<mk-ellipsis></mk-ellipsis></span>
<span if={ fetching }>%i18n:common.loading%<mk-ellipsis></mk-ellipsis></span>
</button>
</footer>
<style>

View file

@ -8,10 +8,10 @@
</div>
<button class="more" if={ !fetching && next != null } onclick={ more } disabled={ moreFetching }>
<span if={ !moreFetching }>%i18n:mobile.tags.mk-users-list.load-more%</span>
<span if={ moreFetching }>%i18n:mobile.tags.mk-users-list.loading%<mk-ellipsis></mk-ellipsis></span></button>
<span if={ moreFetching }>%i18n:common.loading%<mk-ellipsis></mk-ellipsis></span></button>
<p class="no" if={ !fetching && users.length == 0 }>{ opts.noUsers }</p>
<p class="fetching" if={ fetching }>
<i class="fa fa-spinner fa-pulse fa-fw"></i>%i18n:mobile.tags.mk-users-list.loading%<mk-ellipsis></mk-ellipsis>
<i class="fa fa-spinner fa-pulse fa-fw"></i>%i18n:common.loading%<mk-ellipsis></mk-ellipsis>
</p>
<style>
:scope