Skip to content

Commit

Permalink
Merge pull request #620 from h3poteto/iss-251
Browse files Browse the repository at this point in the history
refs #251 Show toot design sample in appearance setting page
  • Loading branch information
h3poteto authored Sep 22, 2018
2 parents c60faa7 + 4890709 commit fbe7e29
Show file tree
Hide file tree
Showing 23 changed files with 875 additions and 499 deletions.
57 changes: 35 additions & 22 deletions src/config/locales/de/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,39 +74,52 @@
"title": "Einstellungen",
"general": {
"title": "Allgemein",
"appearance": "Anzeige",
"theme_color": "Themenfarbe:",
"toot": {
"title": "Toot",
"description": "Customize default visibility of toot.",
"visibility": {
"title": "Standard-Sichtbarkeit",
"public": "Öffenlich",
"unlisted": "Nicht gelistet",
"private": "Privat",
"direct": "Direkt"
}
},
"sounds": {
"title": "Klänge",
"description": "Please set feedback sounds.",
"fav_rb": "When you favourite or boost the toot",
"toot": "When you post toot"
}
},
"appearance": {
"title": "Anzeige",
"theme_color": "Themenfarbe",
"theme": {
"light": "Hell",
"dark": "Dunkel"
},
"font_size": "Schriftgröße:",
"font_size": "Schriftgröße",
"display_style": {
"title": "Anzeigestil:",
"title": "Anzeigestil",
"display_name_and_username": "Anzeige- und Benutzername",
"display_name": "Anzeigename",
"username": "Benutzername"
},
"toot": "Toot",
"visibility": {
"title": "Standard-Sichtbarkeit:",
"public": "Öffenlich",
"unlisted": "Nicht gelistet",
"private": "Privat",
"direct": "Direkt"
},
"sounds": "Klänge",
"fav_rb_sound": "Favorit und Boost:",
"toot_sound": "Toot:"
"time_format": {
"title": "Time format",
"absolute": "Absolute",
"relative": "Relative"
}
},
"notification": {
"title": "Notification",
"notify": {
"title": "Notify",
"reply": "Reply:",
"reblog": "Reblog:",
"favourite": "Favourite:",
"follow": "Follow:"
"enable": {
"description": "Pelase set notification events.",
"reply": "Notify me when I receive reply",
"reblog": "Notify me when I receive reblog",
"favourite": "Notify me when I receive favourite",
"follow": "Notify me when I receive follow"
}
},
"account": {
Expand All @@ -124,7 +137,7 @@
},
"language": {
"title": "Sprache",
"display_language": "Sprache",
"language_description": "Choose the language you would like to use with Whalebird.",
"notice": "Erfordert Neustart",
"confirm": {
"title": "Warnung",
Expand Down
56 changes: 32 additions & 24 deletions src/config/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,44 +74,52 @@
"title": "Preferences",
"general": {
"title": "General",
"appearance": "Appearance",
"theme_color": "Theme color:",
"toot": {
"title": "Toot",
"description": "Customize default visibility of toot.",
"visibility": {
"title": "Default visibility",
"public": "Public",
"unlisted": "Unlisted",
"private": "Private",
"direct": "Direct"
}
},
"sounds": {
"title": "Sounds",
"description": "Please set feedback sounds.",
"fav_rb": "When you favorite or boost the toot",
"toot": "When you post toot"
}
},
"appearance": {
"title": "Appearance",
"theme_color": "Theme color",
"theme": {
"light": "Light",
"dark": "Dark"
},
"font_size": "Font size:",
"font_size": "Font size",
"display_style": {
"title": "Display style:",
"title": "Display style of username",
"display_name_and_username": "Display name and username",
"display_name": "Display name",
"username": "Username"
},
"time_format": {
"title": "Time format:",
"title": "Time format",
"absolute": "Absolute",
"relative": "Relative"
},
"toot": "Toot",
"visibility": {
"title": "Default visibility:",
"public": "Public",
"unlisted": "Unlisted",
"private": "Private",
"direct": "Direct"
},
"sounds": "Sounds",
"fav_rb_sound": "Favorite and Boost:",
"toot_sound": "Toot:"
}
},
"notification": {
"title": "Notification",
"notify": {
"title": "Notify",
"reply": "Reply:",
"reblog": "Reblog:",
"favourite": "Favourite:",
"follow": "Follow:"
"enable": {
"description": "Please set notification events.",
"reply": "Notify me when I receive reply",
"reblog": "Notify me when I receive reblog",
"favourite": "Notify me when I receive favourite",
"follow": "Notify me when I receive follow"
}
},
"account": {
Expand All @@ -129,7 +137,7 @@
},
"language": {
"title": "Language",
"display_language": "language",
"language_description": "Choose the language you would like to use with Whalebird.",
"notice": "Require relaunch",
"confirm": {
"title": "Warning",
Expand Down
57 changes: 35 additions & 22 deletions src/config/locales/fr/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,39 +74,52 @@
"title": "Préférences",
"general": {
"title": "Général",
"appearance": "Apparence",
"theme_color": "Couleur du thème:",
"toot": {
"title": "Pouet",
"description": "Customize default visibility of toot.",
"visibility": {
"title": "Visibilité par défaut",
"public": "Public",
"unlisted": "Public sans être affiché sur le fil public",
"private": "Abonné⋅e⋅s uniquement",
"direct": "Message direct"
}
},
"sounds": {
"title": "Sons",
"description": "Please set feedback sounds.",
"fav_rb": "Partages et favoris",
"toot": "Pouets"
}
},
"appearance": {
"title": "Apparence",
"theme_color": "Couleur du thème",
"theme": {
"light": "Clair",
"dark": "Foncé"
},
"font_size": "Taille des caractères:",
"font_size": "Taille des caractères",
"display_style": {
"title": "Format d'affichage:",
"title": "Format d'affichage",
"display_name_and_username": "Nom et utilisateur⋅trice",
"display_name": "Nom",
"username": "Utilisateur⋅trice"
},
"toot": "Pouet",
"visibility": {
"title": "Visibilité par défaut:",
"public": "Public",
"unlisted": "Public sans être affiché sur le fil public",
"private": "Abonné⋅e⋅s uniquement",
"direct": "Message direct"
},
"sounds": "Sons",
"fav_rb_sound": "Partages et favoris:",
"toot_sound": "Pouets:"
"time_format": {
"title": "Time format",
"absolute": "Absolute",
"relative": "Relative"
}
},
"notification": {
"title": "Notification",
"notify": {
"title": "Notify",
"reply": "Reply:",
"reblog": "Reblog:",
"favourite": "Favourite:",
"follow": "Follow:"
"enable": {
"description": "Please set notification events.",
"reply": "Notify me when I receive reply",
"reblog": "Notify me when I receive reblog",
"favourite": "Notify me when I receive favourite",
"follow": "Notify me when I receive follow"
}
},
"account": {
Expand All @@ -124,7 +137,7 @@
},
"language": {
"title": "Langue",
"display_language": "Langue",
"language_description": "Choose the language you would like to use with Whalebird.",
"notice": "Nécessite un redémarrage",
"confirm": {
"title": "Avertissement",
Expand Down
57 changes: 35 additions & 22 deletions src/config/locales/ja/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,39 +74,52 @@
"title": "設定",
"general": {
"title": "一般",
"appearance": "外観",
"theme_color": "テーマカラー:",
"toot": {
"title": "トゥート",
"description": "トゥートの公開設定を変更できます",
"visibility": {
"title": "公開設定",
"public": "公開",
"unlisted": "未収載",
"private": "フォロワー限定",
"direct": "ダイレクト"
}
},
"sounds": {
"title": "効果音",
"description": "操作時の効果音を設定",
"fav_rb": "お気に入り,ブースト時",
"toot": "トゥート時"
}
},
"appearance": {
"title": "外観",
"theme_color": "テーマカラー",
"theme": {
"light": "標準",
"dark": "ダーク"
},
"font_size": "フォントサイズ:",
"font_size": "フォントサイズ",
"display_style": {
"title": "ユーザ名の表示形式:",
"title": "ユーザ名の表示形式",
"display_name_and_username": "表示名+ユーザー名",
"display_name": "表示名",
"username": "ユーザー名"
},
"toot": "トゥート",
"visibility": {
"title": "公開設定:",
"public": "公開",
"unlisted": "未収載",
"private": "フォロワー限定",
"direct": "ダイレクト"
},
"sounds": "効果音",
"fav_rb_sound": "お気に入り,ブースト時:",
"toot_sound": "トゥート時:"
"time_format": {
"title": "時間の表示形式",
"absolute": "絶対表示",
"relative": "相対表示"
}
},
"notification": {
"title": "通知",
"notify": {
"title": "通知設定",
"reply": "返信:",
"reblog": "ブースト:",
"favourite": "お気に入り:",
"follow": "フォロー:"
"enable": {
"description": "通知を受け取るかどうかを設定",
"reply": "返信がある時",
"reblog": "ブーストされた時",
"favourite": "お気に入りされた時",
"follow": "フォローされた時"
}
},
"account": {
Expand All @@ -124,7 +137,7 @@
},
"language": {
"title": "言語",
"display_language": "表示言語",
"language_description": "Whalebirdの表示言語を選択",
"notice": "再起動が必要です",
"confirm": {
"title": "再起動します",
Expand Down
Loading

0 comments on commit fbe7e29

Please sign in to comment.