Merge pull request #2036 from gutfuckllc/devel

Translated more/ Should build

locales/en.yml

@@ -6,6 +6,15 @@ common:
   misskey: "A ⭐ of the fediverse"
   about-title: "A ⭐ of the fediverse."
   about: "Thank you for finding Misskey. Misskey is a <b>decentralized microblogging platform</b> born on Earth. Since it exists within the Fediverse (a universe where various social media platforms are organized), it is mutually linked with other social media platforms. Why don't you take a short break from the hustle and bustle of the city, and dive into a new Internet?"
+  
+  customization-tips:
+    title: "Customization tips"
+    paragraph1: "Home customization allows you to add/delete, drag and drop and rearrange widgets."
+    paragraph2: "You can change the display by <strong>right clicking</strong> on some widgets."
+    paragraph3: "To delete a widget, <strong>drag and drop the widget onto the area labeled \"Trash\"</strong> in the header."
+    paragraph4: "To finish the customization, click \"Finish\" in the upper right."
+    gotit: "Got it!"
+    
   time:
     unknown: "unknown"
     future: "future"
@@ -17,6 +26,7 @@ common:
     weeks_ago: "{}week(s) ago"
     months_ago: "{}month(s) ago"
     years_ago: "{}year(s) ago"
+  trash: "Garbage bin"
   weekday-short:
     sunday: "S"
     monday: "M"
@@ -397,6 +407,9 @@ desktop/views/components/notifications.vue:
   more: "More"
   empty: "No notifications!"
 desktop/views/components/post-form.vue:
+  add-visible-user: "+ Add user"
+  attach-location-information: "Attach location information"
+  hide-contents: "Hide contents"
   reply-placeholder: "Reply to this note..."
   quote-placeholder: "Quote this note..."
   submit: "Post"
@@ -417,6 +430,11 @@ desktop/views/components/post-form.vue:
   text-remain: "{} characters remaining"
   recent-tags: "Recent"
   click-to-tagging: "Click to tagging"
+  visibility: "Visibility"
+  geolocation-alert: "Your device does not support geolocalization."
+  error: "Error"
+  enter-username: "Please enter a username..."
+  
 desktop/views/components/post-form-window.vue:
   note: "New note"
   reply: "Reply"
@@ -559,6 +577,8 @@ desktop/views/components/settings.profile.vue:
   other: "Other"
   is-bot: "This account is a Bot"
   is-cat: "This account is a Cat"
+  profile-update: "Profile updated"
+  
 desktop/views/components/sub-note-content.vue:
   private: "This post is private"
   deleted: "This post has been deleted"
@@ -869,6 +889,7 @@ mobile/views/pages/settings/settings.profile.vue:
   saved: "Profile updated"
   uploading: "Uploading"
   upload-failed: "Failed to upload"
+  
 mobile/views/pages/search.vue:
   search: "Search"
   empty: "No posts were found for '{}'"

locales/fr.yml

@@ -5,7 +5,16 @@ meta:
 common:
   misskey: "Une ⭐ du fédiverse"
   about-title: "Une ⭐ du fédiverse."
-  about: "Merci d'avoir découvert Misskey. Misskey est une <b>plateforme de micro-blogging distribuée</b> née sur Terre. Parce qu'il fait partie du Fédiverse (un univers composé de diverses plateformes de réseaux sociaux organisées), il est mutuellement connecté avec d'autres plateformes de réseaux sociaux. Désirez-vous prendre une pause, pendant un instant, loin de l'agitation de la ville et plonger dans un nouvel Internet ?"
+  about: "Merci d'avoir découvert Misskey. Misskey est une <b>plateforme de micro-blogging distribuée</b> née sur Terre. Parce qu'il fait partie du Fédiverse (un univers composé de diverses plateformes de réseaux sociaux organisées), il est mutuellement connecté avec d'autres plateformes de réseaux sociaux. Désirez-vous prendre une pause, pendant un instant, loin de l'agitation de la ville et plonger dans un nouvel Internet?"
+  
+  customization-tips:
+    title: "Conseils de personnalisation"
+    paragraph1: "La personnalisation à la maison vous permet d'ajouter / supprimer, glisser et déposer et réorganiser les widgets."
+    paragraph2: "Vous pouvez changer l'affichage en <strong>cliquant droit</strong> sur certains widgets."
+    paragraph3: "Pour supprimer un widget, <strong>glissez et déposez le widget sur la zone étiquetée \"Corbeille\"</strong> dans l'en-tête."
+    paragraph4: "Pour terminer la personnalisation, cliquez sur \"Terminer\" dans le coin supérieur droit."
+    gotit: "Compris!"
+  
   time:
     unknown: "inconnu"
     future: "future"
@@ -17,6 +26,9 @@ common:
     weeks_ago: "Il y a {} semaines·s"
     months_ago: "Il y a {} mois"
     years_ago: "Il y a {} an·s"
+    
+  trash: "Corbeille"
+  
   weekday-short:
     sunday: "D"
     monday: "L"
@@ -32,7 +44,7 @@ common:
     hmm: "Hmm ... ?"
     surprise: "Wow"
     congrats: "Félicitations !"
-    angry: "En colère"
+    angry: "Faché"
     confused: "Confus"
     pudding: "Pudding"
   note-placeholders:
@@ -58,7 +70,7 @@ common:
     opponent-turn: "Tour de l’adversaire"
     turn-of: "C’est le tour de {}"
     past-turn-of: "C'est au tour de {}"
-    won: "{}の勝ち"
+    won: "{} a gagné"
   widgets:
     analog-clock: "Horloge analogique"
     profile: "Profil"

locales/ja.yml

@@ -6,6 +6,14 @@ common:
   misskey: "A ⭐ of fediverse"
   about-title: "A ⭐ of fediverse."
   about: "Misskeyを見つけていただき、ありがとうございます。Misskeyは、地球で生まれた<b>分散マイクロブログSNS</b>です。Fediverse(様々なSNSで構成される宇宙)の中に存在するため、他のSNSと相互に繋がっています。暫し都会の喧騒から離れて、新しいインターネットにダイブしてみませんか。"
+  
+  customization-tips:
+    title: "カスタマイズのヒント"
+    paragraph1: "ホームのカスタマイズでは、ウィジェットを追加/削除したり、ドラッグ&ドロップして並べ替えたりすることができます。"
+    paragraph2: "一部のウィジェットは、<strong><strong>右</strong>クリック</strong>することで表示を変更することができます。"
+    paragraph3: "ウィジェットを削除するには、ヘッダーの<strong>「ゴミ箱」</strong>と書かれたエリアにウィジェットをドラッグ&ドロップします。"
+    paragraph4: "カスタマイズを終了するには、右上の「完了」をクリックします。"
+    gotit: "Got it!"
 
   time:
     unknown: "なぞのじかん"
@@ -19,6 +27,8 @@ common:
     months_ago: "{}ヶ月前"
     years_ago: "{}年前"
 
+  trash: "ゴミ箱"
+
   weekday-short:
     sunday: "日"
     monday: "月"
@@ -460,6 +470,9 @@ desktop/views/components/notifications.vue:
   empty: "ありません！"
 
 desktop/views/components/post-form.vue:
+  add-visible-user: "+ユーザーを追加"
+  attach-location-information: "位置情報を添付する"
+  hide-contents: "内容を隠す"
   reply-placeholder: "この投稿への返信..."
   quote-placeholder: "この投稿を引用..."
   submit: "投稿"
@@ -480,7 +493,11 @@ desktop/views/components/post-form.vue:
   text-remain: "残り{}文字"
   recent-tags: "最近"
   click-to-tagging: "クリックでタグ付け"
-
+  visibility: "公開範囲"
+  geolocation-alert: "お使いの端末は位置情報に対応していません"
+  error: "エラー"
+  enter-username: "ユーザー名を入力してください"
+  
 desktop/views/components/post-form-window.vue:
   note: "新規投稿"
   reply: "返信"
@@ -644,6 +661,7 @@ desktop/views/components/settings.profile.vue:
   other: "その他"
   is-bot: "このアカウントはBotです"
   is-cat: "このアカウントはCatです"
+  profile-updated: "プロフィールを更新しました"
 
 desktop/views/components/sub-note-content.vue:
   private: "この投稿は非公開です"

src/client/app/desktop/views/components/home.vue

@@ -34,7 +34,7 @@
 			</div>
 			<div class="trash">
 				<x-draggable v-model="trash" :options="{ group: 'x' }" @add="onTrash"></x-draggable>
-				<p>ゴミ箱</p>
+				<p>%i18n:common.trash%</p>
 			</div>
 		</div>
 	</div>
@@ -53,7 +53,7 @@
 				</div>
 			</x-draggable>
 			<div class="main">
-				<a @click="hint">カスタマイズのヒント</a>
+				<a @click="hint">%i18n:common.customization-tips.title%</a>
 				<div>
 					<mk-post-form v-if="$store.state.settings.showPostFormOnTopOfTl"/>
 					<mk-timeline ref="tl" @loaded="onTlLoaded"/>
@@ -187,13 +187,13 @@ export default Vue.extend({
 	methods: {
 		hint() {
 			(this as any).apis.dialog({
-				title: '%fa:info-circle%カスタマイズのヒント',
+				title: '%fa:info-circle%%i18n:common.customization-tips.title%',
-				text: '<p>ホームのカスタマイズでは、ウィジェットを追加/削除したり、ドラッグ&ドロップして並べ替えたりすることができます。</p>' +
+				text: '<p>%i18n:common.customization-tips.paragraph1%</p>' +
-					'<p>一部のウィジェットは、<strong><strong>右</strong>クリック</strong>することで表示を変更することができます。</p>' +
+					'<p>%i18n:common.customization-tips.paragraph2%</p>' +
-					'<p>ウィジェットを削除するには、ヘッダーの<strong>「ゴミ箱」</strong>と書かれたエリアにウィジェットをドラッグ&ドロップします。</p>' +
+					'<p>%i18n:common.customization-tips.paragraph3%</p>' +
-					'<p>カスタマイズを終了するには、右上の「完了」をクリックします。</p>',
+					'<p>%i18n:common.customization-tips.paragraph4%</p>',
 				actions: [{
-					text: 'Got it!'
+					text: '%i18n:common.customization-tips.gotit%'
 				}]
 			});
 		},

src/client/app/desktop/views/components/post-form.vue

@@ -8,7 +8,7 @@
 	<div class="content">
 		<div v-if="visibility == 'specified'" class="visibleUsers">
 			<span v-for="u in visibleUsers">{{ u | userName }}<a @click="removeVisibleUser(u)">[x]</a></span>
-			<a @click="addVisibleUser">+ユーザーを追加</a>
+			<a @click="addVisibleUser">%i18n:@add-visible-user%</a>
 		</div>
 		<div class="hashtags" v-if="recentHashtags.length > 0">
 			<b>%i18n:@recent-tags%:</b>
@@ -36,9 +36,9 @@
 	<button class="drive" title="%i18n:@attach-media-from-drive%" @click="chooseFileFromDrive">%fa:cloud%</button>
 	<button class="kao" title="%i18n:@insert-a-kao%" @click="kao">%fa:R smile%</button>
 	<button class="poll" title="%i18n:@create-poll%" @click="poll = true">%fa:chart-pie%</button>
-	<button class="poll" title="内容を隠す" @click="useCw = !useCw">%fa:eye-slash%</button>
+	<button class="poll" title="%i18n:@hide-contents%" @click="useCw = !useCw">%fa:eye-slash%</button>
-	<button class="geo" title="位置情報を添付する" @click="geo ? removeGeo() : setGeo()">%fa:map-marker-alt%</button>
+	<button class="geo" title="%i18n:@attach-location-information%" @click="geo ? removeGeo() : setGeo()">%fa:map-marker-alt%</button>
-	<button class="visibility" title="公開範囲" @click="setVisibility" ref="visibilityButton">
+	<button class="visibility" title="%i18n:@visibility%" @click="setVisibility" ref="visibilityButton">
 		<span v-if="visibility === 'public'">%fa:globe%</span>
 		<span v-if="visibility === 'home'">%fa:home%</span>
 		<span v-if="visibility === 'followers'">%fa:unlock%</span>
@@ -305,7 +305,7 @@ export default Vue.extend({
 
 		setGeo() {
 			if (navigator.geolocation == null) {
-				alert('お使いの端末は位置情報に対応していません');
+				alert('%i18n:@geolocation-alert%');
 				return;
 			}
 
@@ -313,7 +313,7 @@ export default Vue.extend({
 				this.geo = pos.coords;
 				this.$emit('geo-attached', this.geo);
 			}, err => {
-				alert('エラー: ' + err.message);
+				alert('%i18n:@error%: ' + err.message);
 			}, {
 					enableHighAccuracy: true
 				});
@@ -336,7 +336,7 @@ export default Vue.extend({
 
 		addVisibleUser() {
 			(this as any).apis.input({
-				title: 'ユーザー名を入力してください'
+				title: '%i18n:@enter-username%'
 			}).then(username => {
 				(this as any).api('users/show', {
 					username

src/client/app/desktop/views/components/settings.profile.vue

@@ -63,7 +63,7 @@ export default Vue.extend({
 				description: this.description || null,
 				birthday: this.birthday || null
 			}).then(() => {
-				(this as any).apis.notify('プロフィールを更新しました');
+				(this as any).apis.notify('%i18n:@profile-updated%');
 			});
 		},
 		onChangeIsLocked() {