X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=po%2Fja%2Fadmin-core.po;h=027a16081e6cca372b17c76daca6905bd35a5962;hb=dc7138e424dfd454951ed5ed4eeddbf842457e87;hp=9de7c111ee6be9fbbb7ee01793f4b25fdc95829e;hpb=8f2a3f1dccee6a0b7ca99ac24458aa9c8987e131;p=project%2Fluci.git

diff --git a/po/ja/admin-core.po b/po/ja/admin-core.po
index 9de7c111e..027a16081 100644
--- a/po/ja/admin-core.po
+++ b/po/ja/admin-core.po
@@ -14,22 +14,22 @@ msgstr ""
 
 #. The following changes have been applied
 #: i18n/english/luasrc/i18n/admin-core.en.lua:1
-msgid "uci_applied"
+msgid "The following changes have been applied"
 msgstr "以下の変更が適用されました"
 
 #. The following changes have been reverted
 #: i18n/english/luasrc/i18n/admin-core.en.lua:2
-msgid "uci_reverted"
+msgid "The following changes have been reverted"
 msgstr "以下の変更が取り消されました"
 
 #. User Interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:3
-msgid "a_i_ui"
+msgid "User Interface"
 msgstr "ユーザーインターフェース"
 
 #. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection of free Lua software including an <abbr title=\"Model-View-Controller\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the Apache-License.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:4
-msgid "c_lucidesc"
+msgid "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection of free Lua software including an <abbr title=\"Model-View-Controller\">MVC</abbr>-Webframework and webinterface for embedded devices. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is licensed under the Apache-License."
 msgstr ""
 "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> は <abbr title=\"Model-"
 "View-Controller\">MVC</abbr> ウェブフレームワークや組み込みデバイスの為のウェブインターフェースを含む、自由な Lua "
@@ -38,747 +38,747 @@ msgstr ""
 
 #. Project Homepage
 #: i18n/english/luasrc/i18n/admin-core.en.lua:5
-msgid "c_projecthome"
+msgid "Project Homepage"
 msgstr "プロジェクトホームページ"
 
 #. Lead Development
 #: i18n/english/luasrc/i18n/admin-core.en.lua:6
-msgid "c_leaddev"
+msgid "Lead Development"
 msgstr "開発リーダー"
 
 #. Contributing Developers
 #: i18n/english/luasrc/i18n/admin-core.en.lua:7
-msgid "c_contributors"
+msgid "Contributing Developers"
 msgstr "貢献者"
 
 #. Thanks To
 #: i18n/english/luasrc/i18n/admin-core.en.lua:8
-msgid "c_thanksto"
+msgid "Thanks To"
 msgstr "ありがとう"
 
 #. Hello!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:9
-msgid "a_i_i_hello"
+msgid "Hello!"
 msgstr "こんにちは!"
 
 #. This is the administration area of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:10
-msgid "a_i_i_admin1"
+msgid "This is the administration area of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."
 msgstr "ここは <abbr title=\"Lua Configuration Interface\">LuCI</abbr> の管理領域です。"
 
 #. <abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, flexible, and user friendly graphical interface for configuring OpenWrt Kamikaze.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:11
-msgid "a_i_i_admin2"
+msgid "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a free, flexible, and user friendly graphical interface for configuring OpenWrt Kamikaze."
 msgstr ""
 "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> は OpenWrt Kamikaze "
 "の為の自由で、柔軟で、ユーザーフレンドリなグラフィカルインターフェースです。"
 
 #. On the following pages you can adjust all important settings of your router.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:12
-msgid "a_i_i_admin3"
+msgid "On the following pages you can adjust all important settings of your router."
 msgstr "以下のページからルーターの全ての重要な設定を調整することが出来ます。"
 
 #. Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes have to be confirmed by clicking Changes - Save &amp; Apply before being applied.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:13
-msgid "a_i_i_admin4"
+msgid "Notice: In <abbr title=\"Lua Configuration Interface\">LuCI</abbr> changes have to be confirmed by clicking Changes - Save & Apply before being applied."
 msgstr ""
 "注意: <abbr title=\"Lua Configuration Interface\">LuCI</abbr> で変更を行うには適用前に「保存 "
 "&amp; 適用」をクリックして確認する必要があります。"
 
 #. As we always want to improve this interface we are looking forward to your feedback and suggestions.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:14
-msgid "a_i_i_admin5"
+msgid "As we always want to improve this interface we are looking forward to your feedback and suggestions."
 msgstr "私たちとしては、いつでもこのインターフェースを改良したいと望んでおり、あなたからのフィードバックと提案をお待ちしています。"
 
 #. And now have fun with your router!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:15
-msgid "a_i_i_admin6"
+msgid "And now have fun with your router!"
 msgstr "それでは、あなたのルーターを楽しんでください!"
 
 #. The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team
 #: i18n/english/luasrc/i18n/admin-core.en.lua:16
-msgid "a_i_i_team"
+msgid "The <abbr title=\"Lua Configuration Interface\">LuCI</abbr> Team"
 msgstr "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> チーム"
 
 #. Here you can customize the settings and the functionality of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:17
-msgid "a_i_luci1"
+msgid "Here you can customize the settings and the functionality of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."
 msgstr ""
 "ここでは、<abbr title=\"Lua Configuration Interface\">LuCI</abbr> "
 "の機能と設定をカスタマイズ出来ます。"
 
 #. Post-commit actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:18
-msgid "a_i_ucicommit"
+msgid "Post-commit actions"
 msgstr "Post-commit actions"
 
 #. These commands will be executed automatically when a given <abbr title=\"Unified Configuration Interface\">UCI</abbr> configuration is committed allowing changes to be applied instantly.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:19
-msgid "a_i_ucicommit1"
+msgid "These commands will be executed automatically when a given <abbr title=\"Unified Configuration Interface\">UCI</abbr> configuration is committed allowing changes to be applied instantly."
 msgstr ""
 "これらのコマンドはコミットされた <abbr title=\"Unified Configuration "
 "Interface\">UCI</abbr>設定の変更を即座に適応する為に自動的に実行されます。"
 
 #. Files to be kept when flashing a new firmware
 #: i18n/english/luasrc/i18n/admin-core.en.lua:20
-msgid "a_i_keepflash"
+msgid "Files to be kept when flashing a new firmware"
 msgstr "新しいファームウェアを書き込んだ時に維持するファイル"
 
 #. When flashing a new firmware with <abbr title=\"Lua Configuration Interface\">LuCI</abbr> these files will be added to the new firmware installation.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:21
-msgid "a_i_keepflash1"
+msgid "When flashing a new firmware with <abbr title=\"Lua Configuration Interface\">LuCI</abbr> these files will be added to the new firmware installation."
 msgstr ""
 "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> "
 "によって新しいファームウェアを書き込んだ時に、これらのファイルは新しいファームウェアインストールでも追加されます。"
 
 #. Here you can find information about the current system status like <abbr title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory usage or network interface data.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:22
-msgid "a_st_i_status1"
+msgid "Here you can find information about the current system status like <abbr title=\"Central Processing Unit\">CPU</abbr> clock frequency, memory usage or network interface data."
 msgstr ""
 "ここでは、<abbr title=\"Central Processing Unit\">CPU</abbr>クロック周波数、メモリ使用量やネットワークイン"
 "ターフェースデータなどの現在のシステムの状態に関する情報を見つけることが出来ます。"
 
 #. Also kernel or service logfiles can be viewed here to get an overview over their current state.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:23
-msgid "a_st_i_status2"
+msgid "Also kernel or service logfiles can be viewed here to get an overview over their current state."
 msgstr "また、カーネルやサービスのログファイルも現在の状態を得るために参照する事が出来ます。"
 
 #. <abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan
 #: i18n/english/luasrc/i18n/admin-core.en.lua:24
-msgid "iwscan"
+msgid "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan"
 msgstr "<abbr title=\"Wireless Local Area Network\">WLAN</abbr>スキャン"
 
 #. Wifi networks in your local environment
 #: i18n/english/luasrc/i18n/admin-core.en.lua:25
-msgid "iwscan1"
+msgid "Wifi networks in your local environment"
 msgstr "ローカル環境内の無線ネットワーク"
 
 #. <abbr title=\"Encrypted\">Encr.</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:26
-msgid "iwscan_encr"
+msgid "<abbr title=\"Encrypted\">Encr.</abbr>"
 msgstr "<abbr title=\"Encrypted\">暗号化</abbr>"
 
 #. Link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:27
-msgid "iwscan_link"
+msgid "Link"
 msgstr "リンク"
 
 #. Signal
 #: i18n/english/luasrc/i18n/admin-core.en.lua:28
-msgid "iwscan_signal"
+msgid "Signal"
 msgstr "シグナル"
 
 #. Noise
 #: i18n/english/luasrc/i18n/admin-core.en.lua:29
-msgid "iwscan_noise"
+msgid "Noise"
 msgstr "ノイズ"
 
 #. Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:30
-msgid "routes"
+msgid "Routes"
 msgstr "Routes"
 
 #. Netmask
 #: i18n/english/luasrc/i18n/admin-core.en.lua:31
-msgid "routes_netmask"
+msgid "Netmask"
 msgstr "ネットマスク"
 
 #. Gateway
 #: i18n/english/luasrc/i18n/admin-core.en.lua:32
-msgid "routes_gateway"
+msgid "Gateway"
 msgstr "ゲートウェイ"
 
 #. Metric
 #: i18n/english/luasrc/i18n/admin-core.en.lua:33
-msgid "routes_metric"
+msgid "Metric"
 msgstr "メトリック"
 
 #. Here you can configure the basic aspects of your device like its hostname or the timezone.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:34
-msgid "a_s_desc"
+msgid "Here you can configure the basic aspects of your device like its hostname or the timezone."
 msgstr "ここでは、ホスト名やタイムゾーンなどの基本的な設定を行うことが出来ます。"
 
 #. Software
 #: i18n/english/luasrc/i18n/admin-core.en.lua:35
-msgid "a_s_packages"
+msgid "Software"
 msgstr "ソフトウェア"
 
 #. Admin Password
 #: i18n/english/luasrc/i18n/admin-core.en.lua:36
-msgid "a_s_changepw"
+msgid "Admin Password"
 msgstr "管理者パスワード"
 
 #. OPKG-Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:37
-msgid "a_s_p_ipkg"
+msgid "OPKG-Configuration"
 msgstr "OPKG設定"
 
 #. <abbr title=\"Secure Shell\">SSH</abbr>-Keys
 #: i18n/english/luasrc/i18n/admin-core.en.lua:38
-msgid "a_s_sshkeys"
+msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Keys"
 msgstr "<abbr title=\"Secure Shell\">SSH</abbr>鍵"
 
 #. Mount Points
 #: i18n/english/luasrc/i18n/admin-core.en.lua:39
-msgid "a_s_fstab"
+msgid "Mount Points"
 msgstr "マウントポイント"
 
 #. Change settings related to the system itself, its identification, installed hard- and software, authentication or mount points.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:40
-msgid "a_s_i_system1"
+msgid "Change settings related to the system itself, its identification, installed hard- and software, authentication or mount points."
 msgstr ""
 "Change settings related to the system itself, its identification, installed "
 "hard- and software, authentication or mount points."
 
 #. These settings define the base of your system.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:41
-msgid "a_s_i_system2"
+msgid "These settings define the base of your system."
 msgstr "These settings define the base of your system."
 
 #. Pay attention as any misconfiguration here may prevent your device from booting or may lock yourself out of it.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:42
-msgid "a_s_i_system3"
+msgid "Pay attention as any misconfiguration here may prevent your device from booting or may lock yourself out of it."
 msgstr ""
 "Pay attention as any misconfiguration here may prevent your device from "
 "booting or may lock yourself out of it."
 
 #. Interfaces
 #: i18n/english/luasrc/i18n/admin-core.en.lua:43
-msgid "a_s_if"
+msgid "Interfaces"
 msgstr "インターフェース"
 
 #. Bridge
 #: i18n/english/luasrc/i18n/admin-core.en.lua:44
-msgid "a_s_if_bridge"
+msgid "Bridge"
 msgstr "ブリッジ"
 
 #. ID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:45
-msgid "a_s_if_bridge_id"
+msgid "ID"
 msgstr "ID"
 
 #. Bridge Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:46
-msgid "a_s_if_bridge_port"
+msgid "Bridge Port"
 msgstr "ブリッジポート"
 
 #. STP
 #: i18n/english/luasrc/i18n/admin-core.en.lua:47
-msgid "a_s_if_bridge_stp"
+msgid "STP"
 msgstr "STP"
 
 #. Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:48
-msgid "a_s_if_device"
+msgid "Device"
 msgstr "デバイス"
 
 #. Ethernet Bridge
 #: i18n/english/luasrc/i18n/admin-core.en.lua:49
-msgid "a_s_if_ethbridge"
+msgid "Ethernet Bridge"
 msgstr "イーサネットブリッジ"
 
 #. Ethernet Adapter
 #: i18n/english/luasrc/i18n/admin-core.en.lua:50
-msgid "a_s_if_ethdev"
+msgid "Ethernet Adapter"
 msgstr "イーサネットアダプタ"
 
 #. Ethernet Switch
 #: i18n/english/luasrc/i18n/admin-core.en.lua:51
-msgid "a_s_if_ethswitch"
+msgid "Ethernet Switch"
 msgstr "イーサネットスイッチ"
 
 #. Interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:52
-msgid "a_s_if_interface"
+msgid "Interface"
 msgstr "インターフェース"
 
 #. IP Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:53
-msgid "a_s_if_ipconfig"
+msgid "IP Configuration"
 msgstr "IP 設定"
 
 #. Alias
 #: i18n/english/luasrc/i18n/admin-core.en.lua:54
-msgid "a_s_if_ipconfig_alias"
+msgid "Alias"
 msgstr "エイリアス"
 
 #. DHCP assigned
 #: i18n/english/luasrc/i18n/admin-core.en.lua:55
-msgid "a_s_if_ipconfig_dhcp"
+msgid "DHCP assigned"
 msgstr "DHCP assigned"
 
 #. IPv6
 #: i18n/english/luasrc/i18n/admin-core.en.lua:56
-msgid "a_s_if_ipconfig_ipv6"
+msgid "IPv6"
 msgstr "IPv6"
 
 #. Not configured
 #: i18n/english/luasrc/i18n/admin-core.en.lua:57
-msgid "a_s_if_ipconfig_none"
+msgid "Not configured"
 msgstr "未設定"
 
 #. Primary
 #: i18n/english/luasrc/i18n/admin-core.en.lua:58
-msgid "a_s_if_ipconfig_primary"
+msgid "Primary"
 msgstr "プライマリ"
 
 #. Channel
 #: i18n/english/luasrc/i18n/admin-core.en.lua:59
-msgid "a_s_if_iwchannel"
+msgid "Channel"
 msgstr "チャンネル"
 
 #. Mode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:60
-msgid "a_s_if_iwmode"
+msgid "Mode"
 msgstr "モード"
 
 #. Ad-Hoc
 #: i18n/english/luasrc/i18n/admin-core.en.lua:61
-msgid "a_s_if_iwmode_adhoc"
+msgid "Ad-Hoc"
 msgstr "アドホック"
 
 #. Pseudo Ad-Hoc
 #: i18n/english/luasrc/i18n/admin-core.en.lua:62
-msgid "a_s_if_iwmode_ahdemo"
+msgid "Pseudo Ad-Hoc"
 msgstr "擬似アドホック"
 
 #. Master
 #: i18n/english/luasrc/i18n/admin-core.en.lua:63
-msgid "a_s_if_iwmode_ap"
+msgid "Master"
 msgstr "マスター"
 
 #. Master + WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:64
-msgid "a_s_if_iwmode_apwds"
+msgid "Master + WDS"
 msgstr "マスター + WDS"
 
 #. Client
 #: i18n/english/luasrc/i18n/admin-core.en.lua:65
-msgid "a_s_if_iwmode_sta"
+msgid "Client"
 msgstr "クライアント"
 
 #. Client + WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:66
-msgid "a_s_if_iwmode_stawds"
+msgid "Client + WDS"
 msgstr "クライアント + WDS"
 
 #. WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:67
-msgid "a_s_if_iwmode_wds"
+msgid "WDS"
 msgstr "WDS"
 
 #. SSID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:68
-msgid "a_s_if_iwssid"
+msgid "SSID"
 msgstr "SSID"
 
 #. MAC
 #: i18n/english/luasrc/i18n/admin-core.en.lua:69
-msgid "a_s_if_mac"
+msgid "MAC"
 msgstr "MAC"
 
 #. Pkts.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:70
-msgid "a_s_if_pkts"
+msgid "Pkts."
 msgstr "Pkts."
 
 #. Interface Status
 #: i18n/english/luasrc/i18n/admin-core.en.lua:71
-msgid "a_s_if_status"
+msgid "Interface Status"
 msgstr "インターフェース・ステータス"
 
 #. Transfer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:72
-msgid "a_s_if_transfer"
+msgid "Transfer"
 msgstr "転送"
 
 #. RX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:73
-msgid "a_s_if_transfer_rx"
+msgid "RX"
 msgstr "RX"
 
 #. TX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:74
-msgid "a_s_if_transfer_tx"
+msgid "TX"
 msgstr "TX"
 
 #. Type
 #: i18n/english/luasrc/i18n/admin-core.en.lua:75
-msgid "a_s_if_type"
+msgid "Type"
 msgstr "タイプ"
 
 #. VLAN
 #: i18n/english/luasrc/i18n/admin-core.en.lua:76
-msgid "a_s_if_vlan"
+msgid "VLAN"
 msgstr "VLAN"
 
 #. Ports
 #: i18n/english/luasrc/i18n/admin-core.en.lua:77
-msgid "a_s_if_vlanports"
+msgid "Ports"
 msgstr "Ports"
 
 #. Wireless Adapter
 #: i18n/english/luasrc/i18n/admin-core.en.lua:78
-msgid "a_s_if_wifidev"
+msgid "Wireless Adapter"
 msgstr "無線アダプタ"
 
 #. Firewall
 #: i18n/english/luasrc/i18n/admin-core.en.lua:79
-msgid "a_s_ipt"
+msgid "Firewall"
 msgstr "ファイアウォール"
 
 #. Actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:80
-msgid "a_s_ipt_actions"
+msgid "Actions"
 msgstr "動作"
 
 #. Traffic
 #: i18n/english/luasrc/i18n/admin-core.en.lua:81
-msgid "a_s_ipt_bytes"
+msgid "Traffic"
 msgstr "トラフィック"
 
 #. Chain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:82
-msgid "a_s_ipt_chain"
+msgid "Chain"
 msgstr "チェイン"
 
 #. Destination
 #: i18n/english/luasrc/i18n/admin-core.en.lua:83
-msgid "a_s_ipt_destination"
+msgid "Destination"
 msgstr "Destination"
 
 #. Flags
 #: i18n/english/luasrc/i18n/admin-core.en.lua:84
-msgid "a_s_ipt_flags"
+msgid "Flags"
 msgstr "フラグ"
 
 #. In
 #: i18n/english/luasrc/i18n/admin-core.en.lua:85
-msgid "a_s_ipt_inputif"
+msgid "In"
 msgstr "In"
 
 #. No chains in this table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:86
-msgid "a_s_ipt_nochains"
+msgid "No chains in this table"
 msgstr "No chains in this table"
 
 #. No Rules in this chain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:87
-msgid "a_s_ipt_norules"
+msgid "No Rules in this chain"
 msgstr "No Rules in this chain"
 
 #. Options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:88
-msgid "a_s_ipt_options"
+msgid "Options"
 msgstr "オプション"
 
 #. Out
 #: i18n/english/luasrc/i18n/admin-core.en.lua:89
-msgid "a_s_ipt_outputif"
+msgid "Out"
 msgstr "Out"
 
 #. Packets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:90
-msgid "a_s_ipt_packets"
+msgid "Packets"
 msgstr "パケット"
 
 #. Pkts.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:91
-msgid "a_s_ipt_pkts"
+msgid "Pkts."
 msgstr "Pkts."
 
 #. Policy
 #: i18n/english/luasrc/i18n/admin-core.en.lua:92
-msgid "a_s_ipt_policy"
+msgid "Policy"
 msgstr "ポリシー"
 
 #. Prot.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:93
-msgid "a_s_ipt_prot"
+msgid "Prot."
 msgstr "Prot."
 
 #. References
 #: i18n/english/luasrc/i18n/admin-core.en.lua:94
-msgid "a_s_ipt_references"
+msgid "References"
 msgstr "References"
 
 #. Reset Counters
 #: i18n/english/luasrc/i18n/admin-core.en.lua:95
-msgid "a_s_ipt_reset"
+msgid "Reset Counters"
 msgstr "カウンタのリセット"
 
 #. Restart Firewall
 #: i18n/english/luasrc/i18n/admin-core.en.lua:96
-msgid "a_s_ipt_restart"
+msgid "Restart Firewall"
 msgstr "ファイアウォールの再起動"
 
 #. #
 #: i18n/english/luasrc/i18n/admin-core.en.lua:97
-msgid "a_s_ipt_rulenum"
+msgid "#"
 msgstr "#"
 
 #. Source
 #: i18n/english/luasrc/i18n/admin-core.en.lua:98
-msgid "a_s_ipt_source"
+msgid "Source"
 msgstr "ソース"
 
 #. Firewall Status
 #: i18n/english/luasrc/i18n/admin-core.en.lua:99
-msgid "a_s_ipt_status"
+msgid "Firewall Status"
 msgstr "ファイアウォール・ステータス"
 
 #. Table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:100
-msgid "a_s_ipt_table"
+msgid "Table"
 msgstr "テーブル"
 
 #. Target
 #: i18n/english/luasrc/i18n/admin-core.en.lua:101
-msgid "a_s_ipt_target"
+msgid "Target"
 msgstr "ターゲット"
 
 #. Perform Actions
 #: i18n/english/luasrc/i18n/admin-core.en.lua:102
-msgid "a_s_packages_do"
+msgid "Perform Actions"
 msgstr "実行"
 
 #. Install
 #: i18n/english/luasrc/i18n/admin-core.en.lua:103
-msgid "a_s_packages_install"
+msgid "Install"
 msgstr "インストール"
 
 #. Download and install package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:104
-msgid "a_s_packages_installurl"
+msgid "Download and install package"
 msgstr "パッケージのダウンロードとインストール"
 
 #. Edit package lists and installation targets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:105
-msgid "a_s_packages_ipkg"
+msgid "Edit package lists and installation targets"
 msgstr "パッケージリストとインストールターゲットの編集"
 
 #. Package name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:106
-msgid "a_s_packages_name"
+msgid "Package name"
 msgstr "パッケージ名"
 
 #. Remove
 #: i18n/english/luasrc/i18n/admin-core.en.lua:107
-msgid "a_s_packages_remove"
+msgid "Remove"
 msgstr "削除"
 
 #. Find package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:108
-msgid "a_s_packages_search"
+msgid "Find package"
 msgstr "パッケージを検索"
 
 #. Package lists updated
 #: i18n/english/luasrc/i18n/admin-core.en.lua:109
-msgid "a_s_packages_update"
+msgid "Package lists updated"
 msgstr "パッケージリストを更新しました"
 
 #. Update package lists
 #: i18n/english/luasrc/i18n/admin-core.en.lua:110
-msgid "a_s_packages_updatelist"
+msgid "Update package lists"
 msgstr "パッケージリストの更新"
 
 #. Upgrade installed packages
 #: i18n/english/luasrc/i18n/admin-core.en.lua:111
-msgid "a_s_packages_upgrade"
+msgid "Upgrade installed packages"
 msgstr "インストールされているパッケージのアップグレード"
 
 #. Could not set default destination
 #: i18n/english/luasrc/i18n/admin-core.en.lua:112
 #, fuzzy
-msgid "a_s_packages_code1"
+msgid "Could not set default destination"
 msgstr "実行"
 
 #. Error parsing config file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:113
 #, fuzzy
-msgid "a_s_packages_code2"
+msgid "Error parsing config file"
 msgstr "実行"
 
 #. Could not create temporary directory (ran out of space?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:114
 #, fuzzy
-msgid "a_s_packages_code3"
+msgid "Could not create temporary directory (ran out of space?)"
 msgstr "実行"
 
 #. Could not get adminstrative lock (ran out of space?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:115
 #, fuzzy
-msgid "a_s_packages_code4"
+msgid "Could not get adminstrative lock (ran out of space?)"
 msgstr "実行"
 
 #. Unsatisfied Dependencies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:116
 #, fuzzy
-msgid "a_s_packages_code5"
+msgid "Unsatisfied Dependencies"
 msgstr "実行"
 
 #. Refused to remove essential package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:117
 #, fuzzy
-msgid "a_s_packages_code6"
+msgid "Refused to remove essential package"
 msgstr "実行"
 
 #. Package has dependents
 #: i18n/english/luasrc/i18n/admin-core.en.lua:118
 #, fuzzy
-msgid "a_s_packages_code7"
+msgid "Package has dependents"
 msgstr "実行"
 
 #. Package has no installation candidate (wrong name?)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:119
 #, fuzzy
-msgid "a_s_packages_code8"
+msgid "Package has no installation candidate (wrong name?)"
 msgstr "実行"
 
 #. Package has no available architecture 
 #: i18n/english/luasrc/i18n/admin-core.en.lua:120
 #, fuzzy
-msgid "a_s_packages_code9"
+msgid "Package has no available architecture "
 msgstr "実行"
 
 #. Package is not trusted
 #: i18n/english/luasrc/i18n/admin-core.en.lua:121
 #, fuzzy
-msgid "a_s_packages_code10"
+msgid "Package is not trusted"
 msgstr "実行"
 
 #. Error while downloading
 #: i18n/english/luasrc/i18n/admin-core.en.lua:122
 #, fuzzy
-msgid "a_s_packages_code11"
+msgid "Error while downloading"
 msgstr "実行"
 
 #. Conflicts with other packages
 #: i18n/english/luasrc/i18n/admin-core.en.lua:123
 #, fuzzy
-msgid "a_s_packages_code12"
+msgid "Conflicts with other packages"
 msgstr "実行"
 
 #. Package is already installed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:124
 #, fuzzy
-msgid "a_s_packages_code13"
+msgid "Package is already installed"
 msgstr "実行"
 
 #. Package has unresolved dependencies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:125
 #, fuzzy
-msgid "a_s_packages_code14"
+msgid "Package has unresolved dependencies"
 msgstr "実行"
 
 #. Refused to downgrade package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:126
 #, fuzzy
-msgid "a_s_packages_code15"
+msgid "Refused to downgrade package"
 msgstr "実行"
 
 #. Package manager ran out of space
 #: i18n/english/luasrc/i18n/admin-core.en.lua:127
 #, fuzzy
-msgid "a_s_packages_code16"
+msgid "Package manager ran out of space"
 msgstr "実行"
 
 #. Bad signature while verifiying package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:128
 #, fuzzy
-msgid "a_s_packages_code17"
+msgid "Bad signature while verifiying package"
 msgstr "実行"
 
 #. MD5 error while verifiying package
 #: i18n/english/luasrc/i18n/admin-core.en.lua:129
 #, fuzzy
-msgid "a_s_packages_code18"
+msgid "MD5 error while verifiying package"
 msgstr "実行"
 
 #. Internal error occured
 #: i18n/english/luasrc/i18n/admin-core.en.lua:130
 #, fuzzy
-msgid "a_s_packages_code19"
+msgid "Internal error occured"
 msgstr "実行"
 
 #. Package lists
 #: i18n/english/luasrc/i18n/admin-core.en.lua:131
-msgid "a_s_p_ipkg_pkglists"
+msgid "Package lists"
 msgstr "パッケージリスト"
 
 #. Installation targets
 #: i18n/english/luasrc/i18n/admin-core.en.lua:132
-msgid "a_s_p_ipkg_targets"
+msgid "Installation targets"
 msgstr "インストールターゲット"
 
 #. Change the password of the system administrator (User <code>root</code>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:133
-msgid "a_s_changepw1"
+msgid "Change the password of the system administrator (User <code>root</code>)"
 msgstr "システム管理者のパスワードを変更します(ユーザー <code>root</code>)"
 
 #. Password successfully changed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:134
-msgid "a_s_changepw_changed"
+msgid "Password successfully changed"
 msgstr "パスワードを変更しました"
 
 #. Error: Passwords do not match
 #: i18n/english/luasrc/i18n/admin-core.en.lua:135
-msgid "a_s_changepw_nomatch"
+msgid "Error: Passwords do not match"
 msgstr "エラー: パスワードが違います"
 
 #. Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys (one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key authentication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:136
-msgid "a_s_sshkeys1"
+msgid "Here you can paste public <abbr title=\"Secure Shell\">SSH</abbr>-Keys (one per line) for <abbr title=\"Secure Shell\">SSH</abbr> public-key authentication."
 msgstr ""
 "ここでは、<abbr title=\"Secure Shell\">SSH</abbr>公開鍵認証で使用する <abbr title=\"Secure "
 "Shell\">SSH</abbr>公開鍵(1行づつ)を貼り付けることが出来ます。"
 
 #. Mount Points
 #: i18n/english/luasrc/i18n/admin-core.en.lua:137
-msgid "a_s_fstab_mountpoints"
+msgid "Mount Points"
 msgstr "マウントポイント"
 
 #. Mount Points define at which point a memory device will be attached to the filesystem
 #: i18n/english/luasrc/i18n/admin-core.en.lua:138
-msgid "a_s_fstab_mountpoints1"
+msgid "Mount Points define at which point a memory device will be attached to the filesystem"
 msgstr "マウントポイントは記憶デバイスがファイルシステムの何処にアタッチされているかを定義します。"
 
 #. Mounted file systems
 #: i18n/english/luasrc/i18n/admin-core.en.lua:139
-msgid "a_s_fstab_active"
+msgid "Mounted file systems"
 msgstr "マウント中のファイルシステム"
 
 #. Used
 #: i18n/english/luasrc/i18n/admin-core.en.lua:140
-msgid "a_s_fstab_used"
+msgid "Used"
 msgstr "使用"
 
 #. Available
 #: i18n/english/luasrc/i18n/admin-core.en.lua:141
-msgid "a_s_fstab_avail"
+msgid "Available"
 msgstr "使用可"
 
 #. Mount Point
 #: i18n/english/luasrc/i18n/admin-core.en.lua:142
-msgid "a_s_fstab_mountpoint"
+msgid "Mount Point"
 msgstr "マウントポイント"
 
 #. The device file of the memory or partition (<abbr title=\"for example\">e.g.</abbr> <code>/dev/sda1</code>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:143
-msgid "a_s_fstab_device1"
+msgid "The device file of the memory or partition (<abbr title=\"for example\">e.g.</abbr> <code>/dev/sda1</code>)"
 msgstr ""
 "デバイスファイルかパーティション(<abbr title=\"for example\">例</abbr> <code>/dev/sda1</code>)"
 
 #. The filesystem that was used to format the memory (<abbr title=\"for example\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></samp>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:144
-msgid "a_s_fstab_fs1"
+msgid "The filesystem that was used to format the memory (<abbr title=\"for example\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></samp>)"
 msgstr ""
 "ファイルシステムは、使用する記憶フォーマットです。(<abbr title=\"for example\">例</abbr> <samp><abbr "
 "title=\"Third Extended Filesystem\">ext3</abbr></samp>)"
 
 #. If your physical memory is insufficient unused data can be temporarily swapped to a swap-device resulting in a higher amount of usable <abbr title=\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very slow process as the swap-device cannot be accessed with the high datarates of the <abbr title=\"Random Access Memory\">RAM</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:145
-msgid "a_s_fstab_swap1"
+msgid "If your physical memory is insufficient unused data can be temporarily swapped to a swap-device resulting in a higher amount of usable <abbr title=\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very slow process as the swap-device cannot be accessed with the high datarates of the <abbr title=\"Random Access Memory\">RAM</abbr>."
 msgstr ""
 "物理メモリが不足した時に、一時的に未使用なデータをもっと大容量<abbr title=\"Random Access Memory\">RAM</abbr>"
 "によるスワップデバイスへ退避することが出来ます。データの退避は非常に遅い処理なのでスワップデバイスには高い転送レートの<abbr "
@@ -786,165 +786,165 @@ msgstr ""
 
 #. Reboots the operating system of your device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:146
-msgid "a_s_reboot1"
+msgid "Reboots the operating system of your device"
 msgstr "デバイスのオペレーティングシステムを再起動します。"
 
 #. Perform reboot
 #: i18n/english/luasrc/i18n/admin-core.en.lua:147
-msgid "a_s_reboot_do"
+msgid "Perform reboot"
 msgstr "再起動を実行"
 
 #. Please wait: Device rebooting...
 #: i18n/english/luasrc/i18n/admin-core.en.lua:148
-msgid "a_s_reboot_running"
+msgid "Please wait: Device rebooting..."
 msgstr "しばらくお待ちください: 再起動中..."
 
 #. Warning: There are unsaved changes that will be lost while rebooting!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:149
-msgid "a_s_reboot_u"
+msgid "Warning: There are unsaved changes that will be lost while rebooting!"
 msgstr "警告: これらの保存されていない変更は再起動後に失われます!"
 
 #. Changes applied.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:150
-msgid "a_s_applyreboot1"
+msgid "Changes applied."
 msgstr "変更が適用されました。"
 
 #. Backup / Restore
 #: i18n/english/luasrc/i18n/admin-core.en.lua:151
-msgid "a_s_backup"
+msgid "Backup / Restore"
 msgstr "バックアップ / 復元"
 
 #. Create backup
 #: i18n/english/luasrc/i18n/admin-core.en.lua:152
-msgid "a_s_backup_backup"
+msgid "Create backup"
 msgstr "バックアップの作成"
 
 #. Backup Archive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:153
-msgid "a_s_backup_archive"
+msgid "Backup Archive"
 msgstr "バックアップアーカイブ"
 
 #. Reset router to defaults
 #: i18n/english/luasrc/i18n/admin-core.en.lua:154
-msgid "a_s_backup_reset"
+msgid "Reset router to defaults"
 msgstr "ルーターを初期状態にリセット"
 
 #. Proceed reverting all settings and resetting to firmware defaults?
 #: i18n/english/luasrc/i18n/admin-core.en.lua:155
-msgid "a_s_backup_reset1"
+msgid "Proceed reverting all settings and resetting to firmware defaults?"
 msgstr "全ての設定を元に戻し、ファームウェアを初期状態にリセットしますか?"
 
 #. Restore backup
 #: i18n/english/luasrc/i18n/admin-core.en.lua:156
-msgid "a_s_backup_restore"
+msgid "Restore backup"
 msgstr "バックアップから復元する"
 
 #. Here you can backup and restore your router configuration and - if possible - reset the router to the default settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:157
-msgid "a_s_backup1"
+msgid "Here you can backup and restore your router configuration and - if possible - reset the router to the default settings."
 msgstr "ここでは、ルーターの設定のバックアップと復元と、可能であればルーターを初期状態にリセットします。"
 
 #. <abbr title=\"Hypertext Transfer Protocol\">HTTP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:158
-msgid "a_srv_http"
+msgid "<abbr title=\"Hypertext Transfer Protocol\">HTTP</abbr>-Server"
 msgstr "<abbr title=\"Hypertext Transfer Protocol\">HTTP</abbr>サーバー"
 
 #. <abbr title=\"Secure Shell\">SSH</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:159
-msgid "a_srv_ssh"
+msgid "<abbr title=\"Secure Shell\">SSH</abbr>-Server"
 msgstr "<abbr title=\"Secure Shell\">SSH</abbr>サーバー"
 
 #. Services and daemons perform certain tasks on your device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:160
-msgid "a_srv_services1"
+msgid "Services and daemons perform certain tasks on your device."
 msgstr "サービスとデーモンはデバイスで動作するある種のタスクを実行します。"
 
 #. Most of them are network servers, that offer a certain service for your device or network like shell access, serving webpages like <abbr title=\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending e-mails, ...
 #: i18n/english/luasrc/i18n/admin-core.en.lua:161
-msgid "a_srv_services2"
+msgid "Most of them are network servers, that offer a certain service for your device or network like shell access, serving webpages like <abbr title=\"Lua Configuration Interface\">LuCI</abbr>, doing mesh routing, sending e-mails, ..."
 msgstr ""
 "ネットワークサーバーの多くは、デバイスへのシェルアクセスや WEPページを提供する <abbr title=\"Lua Configuration "
 "Interface\">LuCI</abbr> やメッシュルーティングやメールを送ったりなどの特定のサービスを提供します。"
 
 #. A small webserver which can be used to serve <abbr title=\"Lua Configuration Interface\">LuCI</abbr>.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:162
-msgid "a_srv_http1"
+msgid "A small webserver which can be used to serve <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."
 msgstr ""
 "<abbr title=\"Lua Configuration Interface\">LuCI</abbr>を動作させるのに使用することが出来る小さな "
 "WEBサーバーです。"
 
 #. Authentication Realm
 #: i18n/english/luasrc/i18n/admin-core.en.lua:163
-msgid "a_srv_http_authrealm"
+msgid "Authentication Realm"
 msgstr "認証レルム"
 
 #. The realm which will be displayed at the authentication prompt for protected pages.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:164
-msgid "a_srv_http_authrealm1"
+msgid "The realm which will be displayed at the authentication prompt for protected pages."
 msgstr "レルムは保護されたページで認証プロンプトを表示します。"
 
 #. defaults to <code>/etc/httpd.conf</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:165
-msgid "a_srv_http_config1"
+msgid "defaults to <code>/etc/httpd.conf</code>"
 msgstr "デフォルトは <code>/etc/httpd.conf</code>"
 
 #. Document root
 #: i18n/english/luasrc/i18n/admin-core.en.lua:166
-msgid "a_srv_http_root"
+msgid "Document root"
 msgstr "ドキュメントルート"
 
 #. Enable Keep-Alive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:167
-msgid "a_srv_http_keepalive"
+msgid "Enable Keep-Alive"
 msgstr "キープアライブを有効にする"
 
 #. Connection timeout
 #: i18n/english/luasrc/i18n/admin-core.en.lua:168
-msgid "a_srv_http_timeout"
+msgid "Connection timeout"
 msgstr "接続タイムアウト"
 
 #. Plugin path
 #: i18n/english/luasrc/i18n/admin-core.en.lua:169
-msgid "a_srv_http_path"
+msgid "Plugin path"
 msgstr "プラグインパス"
 
 #. A lightweight HTTP/1.1 webserver written in C and Lua designed to serve LuCI
 #: i18n/english/luasrc/i18n/admin-core.en.lua:170
-msgid "a_srv_lucittpd"
+msgid "A lightweight HTTP/1.1 webserver written in C and Lua designed to serve LuCI"
 msgstr "軽量な HTTP/1.1 WEBサーバーはCとLuaで書かれ LuCI に役立つ様に設計されています"
 
 #. Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:171
-msgid "a_srv_dropbear1"
+msgid "Dropbear offers <abbr title=\"Secure Shell\">SSH</abbr> network shell access and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
 msgstr ""
 "Dropbear は <abbr title=\"Secure Shell\">SSH</abbr> ネットワークへのシェルアクセスと統合された <abbr "
 "title=\"Secure Copy\">SCP</abbr> サーバーを提供します。"
 
 #. Password authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:172
-msgid "a_srv_d_pwauth"
+msgid "Password authentication"
 msgstr "パスワード認証"
 
 #. Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:173
-msgid "a_srv_d_pwauth1"
+msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
 msgstr "<abbr title=\"Secure Shell\">SSH</abbr> パスワード認証を許可します"
 
 #. Channel
 #: i18n/english/luasrc/i18n/admin-core.en.lua:174
-msgid "a_w_channel"
+msgid "Channel"
 msgstr "チャンネル"
 
 #. On this pages you can find configuration options for <abbr title=\"Wireless Local Area Network\">WLAN</abbr> based wireless networks.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:175
-msgid "a_w_wifi1"
+msgid "On this pages you can find configuration options for <abbr title=\"Wireless Local Area Network\">WLAN</abbr> based wireless networks."
 msgstr ""
 "On this pages you can find configuration options for <abbr title=\"Wireless "
 "Local Area Network\">WLAN</abbr> based wireless networks."
 
 #. You can easily integrate your 802.11a/b/g/n-devices into your physical network and use the virtual adapter support to build wireless repeaters or offer several networks with one device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:176
-msgid "a_w_wifi2"
+msgid "You can easily integrate your 802.11a/b/g/n-devices into your physical network and use the virtual adapter support to build wireless repeaters or offer several networks with one device."
 msgstr ""
 "You can easily integrate your 802.11a/b/g/n-devices into your physical "
 "network and use the virtual adapter support to build wireless repeaters or "
@@ -952,7 +952,7 @@ msgstr ""
 
 #. There is support for Managed, Client, Ad-Hoc and <abbr title=\"Wireless Distribution System\">WDS</abbr> operating modes as well as <abbr title=\"Wi-Fi Protected Access\">WPA</abbr> and <abbr title=\"Wi-Fi Protected Access 2\">WPA2</abbr> encryption for secure communnication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:177
-msgid "a_w_wifi3"
+msgid "There is support for Managed, Client, Ad-Hoc and <abbr title=\"Wireless Distribution System\">WDS</abbr> operating modes as well as <abbr title=\"Wi-Fi Protected Access\">WPA</abbr> and <abbr title=\"Wi-Fi Protected Access 2\">WPA2</abbr> encryption for secure communnication."
 msgstr ""
 "There is support for Managed, Client, Ad-Hoc and <abbr title=\"Wireless "
 "Distribution System\">WDS</abbr> operating modes as well as <abbr title=\"Wi-"
@@ -961,134 +961,134 @@ msgstr ""
 
 #. Here you can configure installed wifi devices.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:178
-msgid "a_w_devices1"
+msgid "Here you can configure installed wifi devices."
 msgstr "ここではインストールされた無線デバイスの設定を行うことが出来ます。"
 
 #. Transmit Antenna
 #: i18n/english/luasrc/i18n/admin-core.en.lua:179
-msgid "a_w_txantenna"
+msgid "Transmit Antenna"
 msgstr "送信アンテナ"
 
 #. Receive Antenna
 #: i18n/english/luasrc/i18n/admin-core.en.lua:180
-msgid "a_w_rxantenna"
+msgid "Receive Antenna"
 msgstr "受信アンテナ"
 
 #. Distance to furthest station (in meter)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:181
-msgid "a_w_distance1"
+msgid "Distance to furthest station (in meter)"
 msgstr "最も遠いメンバーとの距離(メーター)"
 
 #. Diversity
 #: i18n/english/luasrc/i18n/admin-core.en.lua:182
-msgid "a_w_diversity"
+msgid "Diversity"
 msgstr "ダイバーシティ"
 
 #. Country Code
 #: i18n/english/luasrc/i18n/admin-core.en.lua:183
-msgid "a_w_countrycode"
+msgid "Country Code"
 msgstr "国コード"
 
 #. Connection Limit
 #: i18n/english/luasrc/i18n/admin-core.en.lua:184
-msgid "a_w_connlimit"
+msgid "Connection Limit"
 msgstr "接続制限"
 
 #. You can run several wifi networks with one device. Be aware that there are certain hardware and driverspecific restrictions. Normally you can operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network simultaneously.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:185
-msgid "a_w_networks1"
+msgid "You can run several wifi networks with one device. Be aware that there are certain hardware and driverspecific restrictions. Normally you can operate 1 Ad-Hoc or up to 3 Master-Mode and 1 Client-Mode network simultaneously."
 msgstr ""
 "1つのデバイスで複数の無線ネットワークを運用することが出来ます。特定のハードウェアとドライバの仕様の制限が在ることに注意してください。通常では1つのアド"
 "ホックモード、もしくは3つまでのマスターモードと1つのクライアントモードネットワークを同時に稼働できます。"
 
 #. Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:186
-msgid "a_w_netid"
+msgid "Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>)"
 msgstr "ネットワーク名(<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>)"
 
 #. Add the Wifi network to physical network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:187
-msgid "a_w_network1"
+msgid "Add the Wifi network to physical network"
 msgstr "物理ネットワークに無線ネットワークを追加します"
 
 #.  - Create new Network - 
 #: i18n/english/luasrc/i18n/admin-core.en.lua:188
-msgid "a_w_netmanual"
+msgid " - Create new Network - "
 msgstr " - 新しいネットワークを作成 - "
 
 #. Transmit Power
 #: i18n/english/luasrc/i18n/admin-core.en.lua:189
-msgid "a_w_txpwr"
+msgid "Transmit Power"
 msgstr "電波出力"
 
 #. Broadcom Frameburst
 #: i18n/english/luasrc/i18n/admin-core.en.lua:190
-msgid "a_w_brcmburst"
+msgid "Broadcom Frameburst"
 msgstr "Broadcomフレームバースト"
 
 #. Atheros Frameburst
 #: i18n/english/luasrc/i18n/admin-core.en.lua:191
-msgid "a_w_athburst"
+msgid "Atheros Frameburst"
 msgstr "Atherosフレームバースト"
 
 #. RadiusServer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:192
-msgid "a_w_radiussrv"
+msgid "RadiusServer"
 msgstr "Radiusサーバー"
 
 #. Radius-Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:193
-msgid "a_w_radiusport"
+msgid "Radius-Port"
 msgstr "Radiusポート"
 
 #. AP-Isolation
 #: i18n/english/luasrc/i18n/admin-core.en.lua:194
-msgid "a_w_apisolation"
+msgid "AP-Isolation"
 msgstr "APの分離"
 
 #. Prevents Client to Client communication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:195
-msgid "a_w_apisolation1"
+msgid "Prevents Client to Client communication"
 msgstr "クライアント同士の通信を制限します"
 
 #. Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:196
-msgid "a_w_hideessid"
+msgid "Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>を隠す"
 
 #. Access Point
 #: i18n/english/luasrc/i18n/admin-core.en.lua:197
-msgid "a_w_ap"
+msgid "Access Point"
 msgstr "アクセスポイント"
 
 #. Ad-Hoc
 #: i18n/english/luasrc/i18n/admin-core.en.lua:198
-msgid "a_w_adhoc"
+msgid "Ad-Hoc"
 msgstr "アドホック"
 
 #. Pseudo Ad-Hoc (ahdemo)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:199
-msgid "a_w_ahdemo"
+msgid "Pseudo Ad-Hoc (ahdemo)"
 msgstr "擬似アドホック(ahdemo)"
 
 #. Client
 #: i18n/english/luasrc/i18n/admin-core.en.lua:200
-msgid "a_w_client"
+msgid "Client"
 msgstr "クライアント"
 
 #. WDS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:201
-msgid "a_w_wds"
+msgid "WDS"
 msgstr "WDS"
 
 #. Monitor
 #: i18n/english/luasrc/i18n/admin-core.en.lua:202
-msgid "a_w_monitor"
+msgid "Monitor"
 msgstr "モニター"
 
 #. Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> firewalls
 #: i18n/english/luasrc/i18n/admin-core.en.lua:203
-msgid "dhcp_dnsmasq_desc"
+msgid "Dnsmasq is a combined <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server and <abbr title=\"Domain Name System\">DNS</abbr>-Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> firewalls"
 msgstr ""
 "Dnsmasq は <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>サーバーと "
 "<abbr title=\"Network Address Translation\">NAT</abbr>ファイヤーウォールの為の <abbr "
@@ -1096,240 +1096,240 @@ msgstr ""
 
 #. Domain required
 #: i18n/english/luasrc/i18n/admin-core.en.lua:204
-msgid "dhcp_dnsmasq_domainneeded"
+msgid "Domain required"
 msgstr "ドメイン必須"
 
 #. Don&#39;t forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without <abbr title=\"Domain Name System\">DNS</abbr>-Name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:205
-msgid "dhcp_dnsmasq_domainneeded_desc"
+msgid "Don't forward <abbr title=\"Domain Name System\">DNS</abbr>-Requests without <abbr title=\"Domain Name System\">DNS</abbr>-Name"
 msgstr ""
 "<abbr title=\"Domain Name System\">DNS</abbr>名の無い <abbr title=\"Domain Name "
 "System\">DNS</abbr>リクエストを転送しません"
 
 #. Authoritative
 #: i18n/english/luasrc/i18n/admin-core.en.lua:206
-msgid "dhcp_dnsmasq_authoritative"
+msgid "Authoritative"
 msgstr "権威"
 
 #. This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> in the local network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:207
-msgid "dhcp_dnsmasq_authoritative_desc"
+msgid "This is the only <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> in the local network"
 msgstr ""
 "これはローカルネットワーク内のみの <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr>です"
 
 #. Filter private
 #: i18n/english/luasrc/i18n/admin-core.en.lua:208
-msgid "dhcp_dnsmasq_boguspriv"
+msgid "Filter private"
 msgstr "プライベートフィルター"
 
 #. Don&#39;t forward reverse lookups for local networks
 #: i18n/english/luasrc/i18n/admin-core.en.lua:209
-msgid "dhcp_dnsmasq_boguspriv_desc"
+msgid "Don't forward reverse lookups for local networks"
 msgstr "ローカルネットワークの為の逆引きを転送しません"
 
 #. Filter useless
 #: i18n/english/luasrc/i18n/admin-core.en.lua:210
-msgid "dhcp_dnsmasq_filterwin2k"
+msgid "Filter useless"
 msgstr "無駄のフィルター"
 
 #. filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of Windows-systems
 #: i18n/english/luasrc/i18n/admin-core.en.lua:211
-msgid "dhcp_dnsmasq_filterwin2k_desc"
+msgid "filter useless <abbr title=\"Domain Name System\">DNS</abbr>-queries of Windows-systems"
 msgstr "Windowsシステムの無駄な <abbr title=\"Domain Name System\">DNS</abbr>クエリをフィルタします"
 
 #. Localise queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:212
-msgid "dhcp_dnsmasq_localisequeries"
+msgid "Localise queries"
 msgstr "ローカライズクエリ"
 
 #. localises the hostname depending on its subnet
 #: i18n/english/luasrc/i18n/admin-core.en.lua:213
-msgid "dhcp_dnsmasq_localisequeries_desc"
+msgid "localises the hostname depending on its subnet"
 msgstr "サブネットに依存したホスト名をローカライズします"
 
 #. Local Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:214
-msgid "dhcp_dnsmasq_local"
+msgid "Local Server"
 msgstr "ローカルサーバー"
 
 #. Local Domain
 #: i18n/english/luasrc/i18n/admin-core.en.lua:215
-msgid "dhcp_dnsmasq_domain"
+msgid "Local Domain"
 msgstr "ローカルドメイン"
 
 #. Expand Hosts
 #: i18n/english/luasrc/i18n/admin-core.en.lua:216
-msgid "dhcp_dnsmasq_expandhosts"
+msgid "Expand Hosts"
 msgstr "ホスト名展開"
 
 #. adds domain names to hostentries in the resolv file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:217
-msgid "dhcp_dnsmasq_expandhosts_desc"
+msgid "adds domain names to hostentries in the resolv file"
 msgstr "リゾルバファイルのホストエントリにドメイン名を追加します"
 
 #. don&#39;t cache unknown
 #: i18n/english/luasrc/i18n/admin-core.en.lua:218
-msgid "dhcp_dnsmasq_nonegcache"
+msgid "don't cache unknown"
 msgstr "ネガティブキャッシュを行わない"
 
 #. prevents caching of negative <abbr title=\"Domain Name System\">DNS</abbr>-replies
 #: i18n/english/luasrc/i18n/admin-core.en.lua:219
-msgid "dhcp_dnsmasq_nonegcache_desc"
+msgid "prevents caching of negative <abbr title=\"Domain Name System\">DNS</abbr>-replies"
 msgstr "ネガティブキャッシュの<abbr title=\"Domain Name System\">DNS</abbr>応答を防ぎます"
 
 #. Use <code>/etc/ethers</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:220
-msgid "dhcp_dnsmasq_readethers"
+msgid "Use <code>/etc/ethers</code>"
 msgstr "<code>/etc/ethers</code> を使用する"
 
 #. Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:221
-msgid "dhcp_dnsmasq_readethers_desc"
+msgid "Read <code>/etc/ethers</code> to configure the <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Server"
 msgstr ""
 "<abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr>サーバーの設定の為に<code>/etc/ethers</code> を読みます"
 
 #. Leasefile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:222
-msgid "dhcp_dnsmasq_leasefile"
+msgid "Leasefile"
 msgstr "リースファイル"
 
 #. file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-leases will be stored
 #: i18n/english/luasrc/i18n/admin-core.en.lua:223
-msgid "dhcp_dnsmasq_leasefile_desc"
+msgid "file where given <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-leases will be stored"
 msgstr ""
 "<abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>リース情報が保存されるファイル"
 
 #. Resolvfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:224
-msgid "dhcp_dnsmasq_resolvfile"
+msgid "Resolvfile"
 msgstr "リゾルバファイル"
 
 #. local <abbr title=\"Domain Name System\">DNS</abbr> file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:225
-msgid "dhcp_dnsmasq_resolvfile_desc"
+msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
 msgstr "ローカル <abbr title=\"Domain Name System\">DNS</abbr>ファイル"
 
 #. Ignore <code>/etc/hosts</code>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:226
-msgid "dhcp_dnsmasq_nohosts"
+msgid "Ignore <code>/etc/hosts</code>"
 msgstr "<code>/etc/hosts</code>を無視"
 
 #. Strict order
 #: i18n/english/luasrc/i18n/admin-core.en.lua:227
-msgid "dhcp_dnsmasq_strictorder"
+msgid "Strict order"
 msgstr "Strict order"
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in the order of the resolvfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:228
-msgid "dhcp_dnsmasq_strictorder_desc"
+msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server will be queried in the order of the resolvfile"
 msgstr "<abbr title=\"Domain Name System\">DNS</abbr>サーバーはリゾルバファイルの順に問い合わせを行います。"
 
 #. Log queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:229
-msgid "dhcp_dnsmasq_logqueries"
+msgid "Log queries"
 msgstr "Log queries"
 
 #. Ignore resolve file
 #: i18n/english/luasrc/i18n/admin-core.en.lua:230
-msgid "dhcp_dnsmasq_noresolv"
+msgid "Ignore resolve file"
 msgstr "Ignore resolve file"
 
 #. concurrent queries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:231
-msgid "dhcp_dnsmasq_dnsforwardmax"
+msgid "concurrent queries"
 msgstr "並列問い合わせ"
 
 #. <abbr title=\"Domain Name System\">DNS</abbr>-Port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:232
-msgid "dhcp_dnsmasq_port"
+msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Port"
 msgstr "<abbr title=\"Domain Name System\">DNS</abbr>-Port"
 
 #. <abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms for Domain Name System\">EDNS0</abbr> paket size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:233
-msgid "dhcp_dnsmasq_ednspacket_max"
+msgid "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms for Domain Name System\">EDNS0</abbr> paket size"
 msgstr ""
 "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> paket size"
 
 #. <abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:234
-msgid "dhcp_dnsmasq_dhcpleasemax"
+msgid "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>-Leases"
 msgstr ""
 "<abbr title=\"maximal\">max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr>リース"
 
 #. additional hostfile
 #: i18n/english/luasrc/i18n/admin-core.en.lua:235
-msgid "dhcp_dnsmasq_addnhosts"
+msgid "additional hostfile"
 msgstr "追加のホストファイル"
 
 #. query port
 #: i18n/english/luasrc/i18n/admin-core.en.lua:236
-msgid "dhcp_dnsmasq_queryport"
+msgid "query port"
 msgstr "問い合わせポート"
 
 #. Enable TFTP-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:237
-msgid "dhcp_dnsmasq_enabletftp"
+msgid "Enable TFTP-Server"
 msgstr "TFTPサーバーを有効にする"
 
 #. TFTP-Server Root
 #: i18n/english/luasrc/i18n/admin-core.en.lua:238
-msgid "dhcp_dnsmasq_tftproot"
+msgid "TFTP-Server Root"
 msgstr "TFTPサーバールート"
 
 #. Network Boot Image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:239
-msgid "dhcp_dnsmasq_dhcpboot"
+msgid "Network Boot Image"
 msgstr "ネットワークブートイメージ"
 
 #. Switch
 #: i18n/english/luasrc/i18n/admin-core.en.lua:240
-msgid "a_n_switch"
+msgid "Switch"
 msgstr "スイッチ"
 
 #. Active Connections
 #: i18n/english/luasrc/i18n/admin-core.en.lua:241
-msgid "a_n_conntrack"
+msgid "Active Connections"
 msgstr "アクティブコネクション"
 
 #. This page gives an overview over currently active network connections.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:242
-msgid "a_n_conntrack_desc"
+msgid "This page gives an overview over currently active network connections."
 msgstr "このページは現在アクティブなネットワークネクションの概要を表示します。"
 
 #. Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:243
-msgid "a_n_routes"
+msgid "Routes"
 msgstr "ルーティング"
 
 #. IPv4 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:244
-msgid "a_n_routes4"
+msgid "IPv4 Routes"
 msgstr "IPv4 ルーティング"
 
 #. IPv6 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:245
-msgid "a_n_routes6"
+msgid "IPv6 Routes"
 msgstr "IPv6 ルーティング"
 
 #. In this area you find all network-related settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:246
-msgid "a_network1"
+msgid "In this area you find all network-related settings."
 msgstr "In this area you find all network-related settings."
 
 #. On most routers the network switch can be freely configured and splitted up into several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:247
-msgid "a_network2"
+msgid "On most routers the network switch can be freely configured and splitted up into several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s."
 msgstr ""
 "On most routers the network switch can be freely configured and splitted up "
 "into several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s."
 
 #. Interfaces and <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> / <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Settings allow a custom organisation of the network and connections to other networks like the internet.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:248
-msgid "a_network3"
+msgid "Interfaces and <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> / <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Settings allow a custom organisation of the network and connections to other networks like the internet."
 msgstr ""
 "Interfaces and <abbr title=\"Point-to-Point Protocol over "
 "Ethernet\">PPPoE</abbr> / <abbr title=\"Point-to-Point Tunneling "
@@ -1338,7 +1338,7 @@ msgstr ""
 
 #. With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> devices in your local network can be automatically configured for network communication.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:249
-msgid "a_network4"
+msgid "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> devices in your local network can be automatically configured for network communication."
 msgstr ""
 "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> devices "
 "in your local network can be automatically configured for network "
@@ -1346,14 +1346,14 @@ msgstr ""
 
 #. Firewall and portforwarding can be used to secure your network while providing services to external networks.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:250
-msgid "a_network5"
+msgid "Firewall and portforwarding can be used to secure your network while providing services to external networks."
 msgstr ""
 "Firewall and portforwarding can be used to secure your network while "
 "providing services to external networks."
 
 #. The network ports on your router can be combined to several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s in which computers can communicate directly with each other. <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s are often used to separate different network segments. Often there is by default one Uplink port for a connection to the next greater network like the internet and other ports for a local network.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:251
-msgid "a_n_switch1"
+msgid "The network ports on your router can be combined to several <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s in which computers can communicate directly with each other. <abbr title=\"Virtual Local Area Network\">VLAN</abbr>s are often used to separate different network segments. Often there is by default one Uplink port for a connection to the next greater network like the internet and other ports for a local network."
 msgstr ""
 "ルーターのネットワークポートはコンピューターがお互いに直接通信することが出来る幾つかの <abbr title=\"Virtual Local Area "
 "Network\">VLAN</abbr>s を組み合わせることが出来ます。<abbr title=\"Virtual Local Area "
@@ -1362,7 +1362,7 @@ msgstr ""
 
 #. Ports belonging to a <abbr title=\"Virtual Local Area Network\">VLAN</abbr> are separated with spaces. The port with the highest number (usually 5) is oftern the connection to the internal network interface of the router. On devices with 5 ports often the one with the lowest number (0) is the predefined Uplink port.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:252
-msgid "network_switch_desc"
+msgid "Ports belonging to a <abbr title=\"Virtual Local Area Network\">VLAN</abbr> are separated with spaces. The port with the highest number (usually 5) is oftern the connection to the internal network interface of the router. On devices with 5 ports often the one with the lowest number (0) is the predefined Uplink port."
 msgstr ""
 "ポートは領域を区切られた <abbr title=\"Virtual Local Area Network\">VLAN</abbr> に属します。数字の最"
 "も大きいポート(通常5)はよくルーターの内部ネットワークインターフェースへの接続に使用されます。デバイス上の5つポートで数字の最も小さいポート(0)はア"
@@ -1370,7 +1370,7 @@ msgstr ""
 
 #. On this page you can configure the network interfaces. You can bridge several interfaces by ticking the &quot;bridge interfaces&quot; field and enter the names of several network interfaces separated by spaces. You can also use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation <samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: <samp>eth0.1</samp>).
 #: i18n/english/luasrc/i18n/admin-core.en.lua:253
-msgid "a_n_ifaces1"
+msgid "On this page you can configure the network interfaces. You can bridge several interfaces by ticking the \"bridge interfaces\" field and enter the names of several network interfaces separated by spaces. You can also use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation <samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: <samp>eth0.1</samp>)."
 msgstr ""
 "ここではネットワークインターフェースの設定を行うことが出来ます。&quot;ブリッジインターフェース&quot;フィールドをチェックし、複数のネットワー"
 "クインターフェース名をスペースで区切りで入力することで複数のインターフェースをブリッジすることが出来ます。また、<samp>INTERFACE.VLAN"
@@ -1380,25 +1380,25 @@ msgstr ""
 
 #. Bridge interfaces
 #: i18n/english/luasrc/i18n/admin-core.en.lua:254
-msgid "a_n_i_bridge"
+msgid "Bridge interfaces"
 msgstr "ブリッジインターフェース"
 
 #. creates a bridge over specified interface(s)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:255
-msgid "a_n_i_bridge1"
+msgid "creates a bridge over specified interface(s)"
 msgstr "指定したインターフェースでブリッジを作成します"
 
 #. Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>
-msgid "a_n_i_stp"
+msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 msgstr ""
 
 #. Enables the Spanning Tree Protocol on this bridge
-msgid "a_n_i_stp1"
+msgid "Enables the Spanning Tree Protocol on this bridge"
 msgstr ""
 
 #. With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> network members can automatically receive their network settings (<abbr title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title=\"Domain Name System\">DNS</abbr>-server, ...).
 #: i18n/english/luasrc/i18n/admin-core.en.lua:256
-msgid "dhcp_desc"
+msgid "With <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> network members can automatically receive their network settings (<abbr title=\"Internet Protocol\">IP</abbr>-address, netmask, <abbr title=\"Domain Name System\">DNS</abbr>-server, ...)."
 msgstr ""
 "<abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
 "によってネットワークメンバは自動的にネットワーク設定(<abbr title=\"Internet "
@@ -1407,79 +1407,79 @@ msgstr ""
 
 #. Leasetime
 #: i18n/english/luasrc/i18n/admin-core.en.lua:257
-msgid "dhcp_dhcp_leasetime"
+msgid "Leasetime"
 msgstr "リース時間"
 
 #. Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:258
-msgid "dhcp_dhcp_dynamicdhcp"
+msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 msgstr "ダイナミック <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 
 #. Ignore interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:259
-msgid "dhcp_dhcp_ignore"
+msgid "Ignore interface"
 msgstr "インターフェースを無視します"
 
 #. disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for this interface
 #: i18n/english/luasrc/i18n/admin-core.en.lua:260
-msgid "dhcp_dhcp_ignore_desc"
+msgid "disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for this interface"
 msgstr ""
 "このインターフェースで <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
 "を無効にします。"
 
 #. Force
 #: i18n/english/luasrc/i18n/admin-core.en.lua:261
-msgid "dhcp_dhcp_force"
+msgid "Force"
 msgstr "強制"
 
 #. first address (last octet)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:262
-msgid "dhcp_dhcp_start_desc"
+msgid "first address (last octet)"
 msgstr "先頭アドレス(最後のオクテット)"
 
 #. number of leased addresses -1
 #: i18n/english/luasrc/i18n/admin-core.en.lua:263
-msgid "dhcp_dhcp_limit_desc"
+msgid "number of leased addresses -1"
 msgstr "number of leased addresses -1"
 
 #. DHCP-Options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:264
-msgid "dhcp_dhcp_dhcpoption"
+msgid "DHCP-Options"
 msgstr "DHCPオプション"
 
 #. See &quot;dnsmasq --help dhcp&quot; for a list of available options.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:265
-msgid "dhcp_dhcp_dhcpoption_desc"
+msgid "See \"dnsmasq --help dhcp\" for a list of available options."
 msgstr "有効なオプションの一覧は &quot;dnsmasq --help dhcp&quot; を参照してください。"
 
 #. Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:266
-msgid "dhcp_leases"
+msgid "Leases"
 msgstr "リース"
 
 #. Static Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:267
-msgid "luci_ethers"
+msgid "Static Leases"
 msgstr "静的リース"
 
 #. Leasetime remaining
 #: i18n/english/luasrc/i18n/admin-core.en.lua:268
-msgid "dhcp_timeremain"
+msgid "Leasetime remaining"
 msgstr "残りリース時間"
 
 #. Active Leases
 #: i18n/english/luasrc/i18n/admin-core.en.lua:269
-msgid "dhcp_leases_active"
+msgid "Active Leases"
 msgstr "有効なリース"
 
 #. Point-to-Point Connections
 #: i18n/english/luasrc/i18n/admin-core.en.lua:270
-msgid "a_n_ptp"
+msgid "Point-to-Point Connections"
 msgstr "Point-to-Point接続"
 
 #. Point-to-Point connections with <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> or <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr> are often used to connect a device over <abbr title=\"Digital Subscriber Line\">DSL</abbr> or similar technologies to an internet access point.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:271
-msgid "a_n_ptp1"
+msgid "Point-to-Point connections with <abbr title=\"Point-to-Point Protocol over Ethernet\">PPPoE</abbr> or <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr> are often used to connect a device over <abbr title=\"Digital Subscriber Line\">DSL</abbr> or similar technologies to an internet access point."
 msgstr ""
 "Point-to-Point connections with <abbr title=\"Point-to-Point Protocol over "
 "Ethernet\">PPPoE</abbr> or <abbr title=\"Point-to-Point Tunneling "
@@ -1489,7 +1489,7 @@ msgstr ""
 
 #. You need to install &quot;comgt&quot; for UMTS/GPRS, &quot;ppp-mod-pppoe&quot; for PPPoE, &quot;ppp-mod-pppoa&quot; for PPPoA or &quot;pptp&quot; for PPtP support
 #: i18n/english/luasrc/i18n/admin-core.en.lua:272
-msgid "network_interface_prereq"
+msgid "You need to install \"comgt\" for UMTS/GPRS, \"ppp-mod-pppoe\" for PPPoE, \"ppp-mod-pppoa\" for PPPoA or \"pptp\" for PPtP support"
 msgstr ""
 "UMTS/GPRSを使用する為には &quot;comgt&quot; を、PPPoE の為に &quot;ppp-mod-pppoe&quot; "
 "を、PPPoA の為に &quot;ppp-mod-pppoa&quot; を、PPtP の為に &quot;pptp&quot; "
@@ -1497,696 +1497,696 @@ msgstr ""
 
 #. You need to install &quot;ppp-mod-pppoe&quot; for PPPoE or &quot;pptp&quot; for PPtP support
 #: i18n/english/luasrc/i18n/admin-core.en.lua:273
-msgid "network_interface_prereq_mini"
+msgid "You need to install \"ppp-mod-pppoe\" for PPPoE or \"pptp\" for PPtP support"
 msgstr ""
 "PPPoE をサポートする為には &quot;ppp-mod-pppoe&quot; を、PPtP をサポートする為に &quot;pptp&quot; "
 "をインストールする必要があります。"
 
 #. <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:274
-msgid "network_interface_server"
+msgid "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
 msgstr "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>サーバー"
 
 #. Automatic Disconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:275
-msgid "network_interface_demand"
+msgid "Automatic Disconnect"
 msgstr "自動切断"
 
 #. Time (in seconds) after which an unused connection will be closed
 #: i18n/english/luasrc/i18n/admin-core.en.lua:276
-msgid "network_interface_demand_desc"
+msgid "Time (in seconds) after which an unused connection will be closed"
 msgstr "指定した期間(秒)コネクションが使用されない場合に接続を閉じます"
 
 #. Keep-Alive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:277
-msgid "network_interface_keepalive"
+msgid "Keep-Alive"
 msgstr "キープアライブ"
 
 #. Number of failed connection tests to initiate automatic reconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:278
-msgid "network_interface_keepalive_desc"
+msgid "Number of failed connection tests to initiate automatic reconnect"
 msgstr "自動再接続時に行う接続テストの失敗数"
 
 #. Modem device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:279
-msgid "network_interface_device"
+msgid "Modem device"
 msgstr "モデムデバイス"
 
 #. The device node of your modem, e.g. /dev/ttyUSB0
 #: i18n/english/luasrc/i18n/admin-core.en.lua:280
-msgid "network_interface_device_desc"
+msgid "The device node of your modem, e.g. /dev/ttyUSB0"
 msgstr "これはモデムのデバイスノードです。 例: /dev/ttyUSB0"
 
 #. Replace default route
 #: i18n/english/luasrc/i18n/admin-core.en.lua:281
-msgid "network_interface_defaultroute"
+msgid "Replace default route"
 msgstr "デフォルトルートを置き換える"
 
 #. Let pppd replace the current default route to use the PPP interface after successful connect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:282
-msgid "network_interface_defaultroute_desc"
+msgid "Let pppd replace the current default route to use the PPP interface after successful connect"
 msgstr "接続に成功した後、pppdにデフォルトルートをPPPインターフェースを使用する様に書き換えさせます"
 
 #. Use peer DNS
 #: i18n/english/luasrc/i18n/admin-core.en.lua:283
-msgid "network_interface_peerdns"
+msgid "Use peer DNS"
 msgstr "ピアDNSを使用する"
 
 #. Configure the local DNS server to use the name servers adverticed by the PPP peer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:284
-msgid "network_interface_peerdns_desc"
+msgid "Configure the local DNS server to use the name servers adverticed by the PPP peer"
 msgstr "ローカルDNSサーバーをPPP接続先から通知されたネームサーバーを使用するように設定します"
 
 #. Enable IPv6 on PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:285
-msgid "network_interface_ipv6"
+msgid "Enable IPv6 on PPP link"
 msgstr "IPv6 の PPP リンクを有効にする"
 
 #. Connect script
 #: i18n/english/luasrc/i18n/admin-core.en.lua:286
-msgid "network_interface_connect"
+msgid "Connect script"
 msgstr "接続スクリプト"
 
 #. Let pppd run this script after establishing the PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:287
-msgid "network_interface_connect_desc"
+msgid "Let pppd run this script after establishing the PPP link"
 msgstr "PPPリンクを確立した後、pppd にこのスクリプトを実行させます。"
 
 #. Disconnect script
 #: i18n/english/luasrc/i18n/admin-core.en.lua:288
-msgid "network_interface_disconnect"
+msgid "Disconnect script"
 msgstr "切断スクリプト"
 
 #. Let pppd run this script before tearing down the PPP link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:289
-msgid "network_interface_disconnect_desc"
+msgid "Let pppd run this script before tearing down the PPP link"
 msgstr "PPPリンクを切断した後、pppd にこのスクリプトを実行させます。"
 
 #. Additional pppd options
 #: i18n/english/luasrc/i18n/admin-core.en.lua:290
-msgid "network_interface_pppd_options"
+msgid "Additional pppd options"
 msgstr "pppd 追加オプション"
 
 #. Specify additional command line arguments for pppd here
 #: i18n/english/luasrc/i18n/admin-core.en.lua:291
-msgid "network_interface_pppd_options_desc"
+msgid "Specify additional command line arguments for pppd here"
 msgstr "pppd の為の追加のコマンドライン引数をここに指定します。"
 
 #. Access point (APN)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:292
-msgid "network_interface_apn"
+msgid "Access point (APN)"
 msgstr "アクセスポイント(APN)"
 
 #. PIN code
 #: i18n/english/luasrc/i18n/admin-core.en.lua:293
-msgid "network_interface_pincode"
+msgid "PIN code"
 msgstr "PINコード"
 
 #. Make sure that you provide the correct pin code here or you might lock your sim card!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:294
-msgid "network_interface_pincode_desc"
+msgid "Make sure that you provide the correct pin code here or you might lock your sim card!"
 msgstr ""
 "Make sure that you provide the correct pin code here or you might lock your "
 "sim card!"
 
 #. Service type
 #: i18n/english/luasrc/i18n/admin-core.en.lua:295
-msgid "network_interface_service"
+msgid "Service type"
 msgstr "Service type"
 
 #. Setup wait time
 #: i18n/english/luasrc/i18n/admin-core.en.lua:296
-msgid "network_interface_maxwait"
+msgid "Setup wait time"
 msgstr "Setup wait time"
 
 #. Seconds to wait for the modem to become ready before attempting to connect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:297
-msgid "network_interface_maxwait_desc"
+msgid "Seconds to wait for the modem to become ready before attempting to connect"
 msgstr ""
 "Seconds to wait for the modem to become ready before attempting to connect"
 
 #. PPPoA Encapsulation
 #: i18n/english/luasrc/i18n/admin-core.en.lua:298
-msgid "network_interface_encaps"
+msgid "PPPoA Encapsulation"
 msgstr "PPPoAカプセル化"
 
 #. Routes specify over which interface and gateway a certain host or network can be reached.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:299
-msgid "a_n_r_routes1"
+msgid "Routes specify over which interface and gateway a certain host or network can be reached."
 msgstr ""
 "Routes specify over which interface and gateway a certain host or network "
 "can be reached."
 
 #. Static Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:300
-msgid "a_n_routes_static"
+msgid "Static Routes"
 msgstr "静的ルーティング"
 
 #. Static IPv4 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:301
-msgid "a_n_routes_static4"
+msgid "Static IPv4 Routes"
 msgstr "IPv4 静的ルーティング"
 
 #. Static IPv6 Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:302
-msgid "a_n_routes_static6"
+msgid "Static IPv6 Routes"
 msgstr "IPv6 静的ルーティング"
 
 #. Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:303
-msgid "a_n_routes_kernel4"
+msgid "Active <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Routes"
 msgstr "アクティブ <abbr title=\"Internet Protocol Version 4\">IPv4</abbr>ルーティング"
 
 #. Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:304
-msgid "a_n_routes_kernel6"
+msgid "Active <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Routes"
 msgstr "アクティブ <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>ルーティング"
 
 #. Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:305
-msgid "a_n_r_target1"
+msgid "Host-<abbr title=\"Internet Protocol Address\">IP</abbr> or Network"
 msgstr "ホスト<abbr title=\"Internet Protocol Address\">IP</abbr> or ネットワーク"
 
 #. <abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network (CIDR)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:306
-msgid "a_n_r_target6"
+msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network (CIDR)"
 msgstr ""
 "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>アドレス or ネットワーク(CIDR)"
 
 #. if target is a network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:307
-msgid "a_n_r_netmask1"
+msgid "if target is a network"
 msgstr "ターゲットがネットワークの場合"
 
 #. Internet Connection
 #: i18n/english/luasrc/i18n/admin-core.en.lua:308
-msgid "m_n_inet"
+msgid "Internet Connection"
 msgstr "インターネット接続"
 
 #. Local Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:309
-msgid "m_n_local"
+msgid "Local Network"
 msgstr "ローカルネットワーク"
 
 #. Route
 #: i18n/english/luasrc/i18n/admin-core.en.lua:310
-msgid "m_n_route"
+msgid "Route"
 msgstr "Route"
 
 #. Bridge
 #: i18n/english/luasrc/i18n/admin-core.en.lua:311
-msgid "m_n_brdige"
+msgid "Bridge"
 msgstr "ブリッジ"
 
 #. Provide (Access Point)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:312
-msgid "m_w_ap"
+msgid "Provide (Access Point)"
 msgstr "アクセスポイント"
 
 #. Independent (Ad-Hoc)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:313
-msgid "m_w_adhoc"
+msgid "Independent (Ad-Hoc)"
 msgstr "アドホック"
 
 #. Join (Client)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:314
-msgid "m_w_client"
+msgid "Join (Client)"
 msgstr "クライアント"
 
 #. Distributed (<abbr title=\"Wireless Distribution System\">WDS</abbr>)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:315
-msgid "m_w_wds"
+msgid "Distributed (<abbr title=\"Wireless Distribution System\">WDS</abbr>)"
 msgstr "分散型 (<abbr title=\"Wireless Distribution System\">WDS</abbr>)"
 
 #. Clientmode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:316
-msgid "m_w_clientmode"
+msgid "Clientmode"
 msgstr "クライアントモード"
 
 #. System log buffer size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:317
-msgid "system_system_logsize"
+msgid "System log buffer size"
 msgstr "システムログのバッファサイズ"
 
 #. External system log server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:318
-msgid "system_system_logip"
+msgid "External system log server"
 msgstr "外部のシステムログサーバー"
 
 #. Log output level
 #: i18n/english/luasrc/i18n/admin-core.en.lua:319
-msgid "system_system_conloglevel"
+msgid "Log output level"
 msgstr "ログレベル"
 
 #. Level of log messages on the console
 #: i18n/english/luasrc/i18n/admin-core.en.lua:320
-msgid "system_system_conloglevel_desc"
+msgid "Level of log messages on the console"
 msgstr "コンソールメッセージのログレベル"
 
 #. Processor
 #: i18n/english/luasrc/i18n/admin-core.en.lua:321
-msgid "m_i_processor"
+msgid "Processor"
 msgstr "プロセッサ"
 
 #. Memory
 #: i18n/english/luasrc/i18n/admin-core.en.lua:322
-msgid "m_i_memory"
+msgid "Memory"
 msgstr "メモリー"
 
 #. Local Time
 #: i18n/english/luasrc/i18n/admin-core.en.lua:323
-msgid "m_i_systemtime"
+msgid "Local Time"
 msgstr "ローカルタイム"
 
 #. Uptime
 #: i18n/english/luasrc/i18n/admin-core.en.lua:324
-msgid "m_i_uptime"
+msgid "Uptime"
 msgstr "起動時間"
 
 #. First leased address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:325
-msgid "m_n_d_firstaddress"
+msgid "First leased address"
 msgstr "先頭リースアドレス"
 
 #. Number of leased addresses
 #: i18n/english/luasrc/i18n/admin-core.en.lua:326
-msgid "m_n_d_numleases"
+msgid "Number of leased addresses"
 msgstr "リースアドレス数"
 
 #. Routing table
 #: i18n/english/luasrc/i18n/admin-core.en.lua:327
-msgid "routingtable"
+msgid "Routing table"
 msgstr "ルーティングテーブル"
 
 #. Wifi scan
 #: i18n/english/luasrc/i18n/admin-core.en.lua:328
-msgid "wlanscan"
+msgid "Wifi scan"
 msgstr "Wifi scan"
 
 #. Frequency
 #: i18n/english/luasrc/i18n/admin-core.en.lua:329
-msgid "frequency"
+msgid "Frequency"
 msgstr "Frequency"
 
 #. Power
 #: i18n/english/luasrc/i18n/admin-core.en.lua:330
-msgid "power"
+msgid "Power"
 msgstr "出力"
 
 #. Noise
 #: i18n/english/luasrc/i18n/admin-core.en.lua:331
-msgid "noise"
+msgid "Noise"
 msgstr "ノイズ"
 
 #. Signal
 #: i18n/english/luasrc/i18n/admin-core.en.lua:332
-msgid "signal"
+msgid "Signal"
 msgstr "シグナル"
 
 #. Link
 #: i18n/english/luasrc/i18n/admin-core.en.lua:333
-msgid "link"
+msgid "Link"
 msgstr "リンク"
 
 #. <abbr title=\"Fragmentation\">Frag.</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:334
-msgid "frag"
+msgid "<abbr title=\"Fragmentation\">Frag.</abbr>"
 msgstr "<abbr title=\"Fragmentation\">フラグメンテーション</abbr>"
 
 #. <abbr title=\"Request To Send\">RTS</abbr>
 #: i18n/english/luasrc/i18n/admin-core.en.lua:335
-msgid "rts"
+msgid "<abbr title=\"Request To Send\">RTS</abbr>"
 msgstr "<abbr title=\"Request To Send\">RTS</abbr>"
 
 #. Bitrate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:336
-msgid "bitrate"
+msgid "Bitrate"
 msgstr "ビットレート"
 
 #. automatically reconnect
 #: i18n/english/luasrc/i18n/admin-core.en.lua:337
-msgid "m_n_keepalive"
+msgid "automatically reconnect"
 msgstr "自動再接続"
 
 #. disconnect when idle for
 #: i18n/english/luasrc/i18n/admin-core.en.lua:338
-msgid "m_n_dialondemand"
+msgid "disconnect when idle for"
 msgstr "disconnect when idle for"
 
 #. <abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server
 #: i18n/english/luasrc/i18n/admin-core.en.lua:339
-msgid "m_n_pptp_server"
+msgid "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"
 msgstr "<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>サーバー"
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Configuration
 #: i18n/english/luasrc/i18n/admin-core.en.lua:340
-msgid "leds"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr>設定"
 
 #. Customizes the behaviour of the device <abbr title=\"Light Emitting Diode\">LED</abbr>s if possible.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:341
-msgid "leds_desc"
+msgid "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode\">LED</abbr>s if possible."
 msgstr "可能であれば<abbr title=\"Light Emitting Diode\">LED</abbr>デバイスの動作をカスタマイズします。"
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Name
 #: i18n/english/luasrc/i18n/admin-core.en.lua:342
-msgid "system_led_name"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr>名"
 
 #. <abbr title=\"Light Emitting Diode\">LED</abbr> Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:343
-msgid "system_led_sysfs"
+msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Device"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr>デバイス"
 
 #. Default state
 #: i18n/english/luasrc/i18n/admin-core.en.lua:344
-msgid "system_led_default"
+msgid "Default state"
 msgstr "初期状態"
 
 #. ticked = on
 #: i18n/english/luasrc/i18n/admin-core.en.lua:345
-msgid "system_led_default_desc"
+msgid "ticked = on"
 msgstr "点滅 = オン"
 
 #. Trigger
 #: i18n/english/luasrc/i18n/admin-core.en.lua:346
-msgid "system_led_trigger"
+msgid "Trigger"
 msgstr "トリガー"
 
 #. None
 #: i18n/english/luasrc/i18n/admin-core.en.lua:347
-msgid "system_led_trigger_none"
+msgid "None"
 msgstr "無し"
 
 #. Default On
 #: i18n/english/luasrc/i18n/admin-core.en.lua:348
-msgid "system_led_trigger_defaulton"
+msgid "Default On"
 msgstr "デフォルトでオン"
 
 #. Timer
 #: i18n/english/luasrc/i18n/admin-core.en.lua:349
-msgid "system_led_trigger_timer"
+msgid "Timer"
 msgstr "タイマー"
 
 #. Heartbeat (Load Average)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:350
-msgid "system_led_trigger_heartbeat"
+msgid "Heartbeat (Load Average)"
 msgstr "ハートビート(Load Average)"
 
 #. Network Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:351
-msgid "system_led_trigger_netdev"
+msgid "Network Device"
 msgstr "ネットワークデバイス"
 
 #. Off-State Delay
 #: i18n/english/luasrc/i18n/admin-core.en.lua:352
-msgid "system_led_delayoff"
+msgid "Off-State Delay"
 msgstr "Off状態 時間"
 
 #. Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is off
 #: i18n/english/luasrc/i18n/admin-core.en.lua:353
-msgid "system_led_delayoff_desc"
+msgid "Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is off"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> がオフになる時間(ミリ秒)"
 
 #. On-State Delay
 #: i18n/english/luasrc/i18n/admin-core.en.lua:354
-msgid "system_led_delayon"
+msgid "On-State Delay"
 msgstr "On状態 時間"
 
 #. Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is on
 #: i18n/english/luasrc/i18n/admin-core.en.lua:355
-msgid "system_led_delayon_desc"
+msgid "Time (in ms) the <abbr title=\"Light Emitting Diode\">LED</abbr> is on"
 msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> がオンになる時間(ミリ秒)"
 
 #. Device
 #: i18n/english/luasrc/i18n/admin-core.en.lua:356
-msgid "system_led_dev"
+msgid "Device"
 msgstr "デバイス"
 
 #. Trigger Mode
 #: i18n/english/luasrc/i18n/admin-core.en.lua:357
-msgid "system_led_mode"
+msgid "Trigger Mode"
 msgstr "トリガーモード"
 
 #. Link On
 #: i18n/english/luasrc/i18n/admin-core.en.lua:358
-msgid "system_led_mode_link"
+msgid "Link On"
 msgstr "リンクオン"
 
 #. Transmit
 #: i18n/english/luasrc/i18n/admin-core.en.lua:359
-msgid "system_led_mode_tx"
+msgid "Transmit"
 msgstr "送信"
 
 #. Receive
 #: i18n/english/luasrc/i18n/admin-core.en.lua:360
-msgid "system_led_mode_rx"
+msgid "Receive"
 msgstr "受信"
 
 #. Active
 #: i18n/english/luasrc/i18n/admin-core.en.lua:361
-msgid "network_interface_up"
+msgid "Active"
 msgstr "アクティブ"
 
 #. <abbr title=\"Media Access Control\">MAC</abbr>-Address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:362
-msgid "network_interface_hwaddr"
+msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
 msgstr "<abbr title=\"Media Access Control\">MAC</abbr>アドレス"
 
 #. Hardware Address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:363
-msgid "network_interface_hwaddr_desc"
+msgid "Hardware Address"
 msgstr "ハードウェアアドレス"
 
 #. Traffic
 #: i18n/english/luasrc/i18n/admin-core.en.lua:364
-msgid "network_interface_txrx"
+msgid "Traffic"
 msgstr "トラフィック"
 
 #. transmitted / received
 #: i18n/english/luasrc/i18n/admin-core.en.lua:365
-msgid "network_interface_txrx_desc"
+msgid "transmitted / received"
 msgstr "送信 / 受信"
 
 #. Errors
 #: i18n/english/luasrc/i18n/admin-core.en.lua:366
-msgid "network_interface_err"
+msgid "Errors"
 msgstr "エラー"
 
 #. TX / RX
 #: i18n/english/luasrc/i18n/admin-core.en.lua:367
-msgid "network_interface_err_desc"
+msgid "TX / RX"
 msgstr "TX / RX"
 
 #. Create / Assign firewall-zone
 #: i18n/english/luasrc/i18n/admin-core.en.lua:368
-msgid "network_interface_fwzone"
+msgid "Create / Assign firewall-zone"
 msgstr "ファイアウォールゾーンの作成 / 割り当て"
 
 #. This interface does not belong to any firewall zone yet.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:369
-msgid "network_interface_fwzone_desc"
+msgid "Choose the firewall zone you want to assign to this interface. Select <em>unspecified</em> to remove the interface from the associated zone or fill out the <em>create</em> field to define a new zone and attach the interface to it."
 msgstr "このインターフェースはまだどのファイアウォールゾーンにも属しません。"
 
 #. Processes
 #: i18n/english/luasrc/i18n/admin-core.en.lua:370
-msgid "process_head"
+msgid "Processes"
 msgstr "プロセス"
 
 #. This list gives an overview over currently running system processes and their status.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:371
-msgid "process_descr"
+msgid "This list gives an overview over currently running system processes and their status."
 msgstr "このリストは現在システムで動作しているプロセスとそのステータスを表します。"
 
 #. PID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:372
-msgid "process_pid"
+msgid "PID"
 msgstr "PID"
 
 #. Owner
 #: i18n/english/luasrc/i18n/admin-core.en.lua:373
-msgid "process_owner"
+msgid "Owner"
 msgstr "所有者"
 
 #. Command
 #: i18n/english/luasrc/i18n/admin-core.en.lua:374
-msgid "process_command"
+msgid "Command"
 msgstr "コマンド"
 
 #. CPU usage (%)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:375
-msgid "process_cpu"
+msgid "CPU usage (%)"
 msgstr "CPU使用率 (%)"
 
 #. Memory usage (%)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:376
-msgid "process_mem"
+msgid "Memory usage (%)"
 msgstr "メモリ使用率 (%)"
 
 #. Hang Up
 #: i18n/english/luasrc/i18n/admin-core.en.lua:377
-msgid "process_hup"
+msgid "Hang Up"
 msgstr "再起動"
 
 #. Terminate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:378
-msgid "process_term"
+msgid "Terminate"
 msgstr "停止"
 
 #. Kill
 #: i18n/english/luasrc/i18n/admin-core.en.lua:379
-msgid "process_kill"
+msgid "Kill"
 msgstr "強制終了"
 
 #. cached
 #: i18n/english/luasrc/i18n/admin-core.en.lua:380
-msgid "mem_cached"
+msgid "cached"
 msgstr "cached"
 
 #. buffered
 #: i18n/english/luasrc/i18n/admin-core.en.lua:381
-msgid "mem_buffered"
+msgid "buffered"
 msgstr "buffered"
 
 #. free
 #: i18n/english/luasrc/i18n/admin-core.en.lua:382
-msgid "mem_free"
+msgid "free"
 msgstr "free"
 
 #. Scheduled Tasks
 #: i18n/english/luasrc/i18n/admin-core.en.lua:383
-msgid "a_s_crontab"
+msgid "Scheduled Tasks"
 msgstr "スケジュールタスク"
 
 #. This is the system crontab in which scheduled tasks can be defined.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:384
-msgid "a_s_crontab1"
+msgid "This is the system crontab in which scheduled tasks can be defined."
 msgstr "これは、スケジュールタスクを定義することが出来る crontab システムです。"
 
 #. NAS ID
 #: i18n/english/luasrc/i18n/admin-core.en.lua:385
-msgid "a_w_nasid"
+msgid "NAS ID"
 msgstr "NAS ID"
 
 #. Path to CA-Certificate
 #: i18n/english/luasrc/i18n/admin-core.en.lua:386
-msgid "a_w_cacert"
+msgid "Path to CA-Certificate"
 msgstr "CA証明書のパス"
 
 #. EAP-Method
 #: i18n/english/luasrc/i18n/admin-core.en.lua:387
-msgid "a_w_eaptype"
+msgid "EAP-Method"
 msgstr "EAPメソッド"
 
 #. Path to Private Key
 #: i18n/english/luasrc/i18n/admin-core.en.lua:388
-msgid "a_w_tlsprivkey"
+msgid "Path to Private Key"
 msgstr "秘密鍵のパス"
 
 #. Password of Private Key
 #: i18n/english/luasrc/i18n/admin-core.en.lua:389
-msgid "a_w_tlsprivkeypwd"
+msgid "Password of Private Key"
 msgstr "秘密鍵のパスワード"
 
 #. Authentication
 #: i18n/english/luasrc/i18n/admin-core.en.lua:390
-msgid "a_w_peapauth"
+msgid "Authentication"
 msgstr "認証"
 
 #. Identity
 #: i18n/english/luasrc/i18n/admin-core.en.lua:391
-msgid "a_w_peapidentity"
+msgid "Identity"
 msgstr "識別子"
 
 #. Password
 #: i18n/english/luasrc/i18n/admin-core.en.lua:392
-msgid "a_w_peappassword"
+msgid "Password"
 msgstr "パスワード"
 
 #. Create Network
 #: i18n/english/luasrc/i18n/admin-core.en.lua:393
-msgid "a_w_create"
+msgid "Create Network"
 msgstr "ネットワークの作成"
 
 #. Hostnames
 #: i18n/english/luasrc/i18n/admin-core.en.lua:394
-msgid "hostnames"
+msgid "Hostnames"
 msgstr "ホスト名"
 
 #. Host entries
 #: i18n/english/luasrc/i18n/admin-core.en.lua:395
-msgid "hostnames_entries"
+msgid "Host entries"
 msgstr "ホストエントリー"
 
 #. Hostname
 #: i18n/english/luasrc/i18n/admin-core.en.lua:396
-msgid "hostnames_hostname"
+msgid "Hostname"
 msgstr "ホスト名"
 
 #. IP address
 #: i18n/english/luasrc/i18n/admin-core.en.lua:397
-msgid "hostnames_address"
+msgid "IP address"
 msgstr "IPアドレス"
 
 #. Clamp Segment Size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:398
-msgid "m_n_mssfix"
+msgid "Clamp Segment Size"
 msgstr "Clamp Segment Size"
 
 #. Fixes problems with unreachable websites, submitting forms or other unexpected behaviour for some ISPs.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:399
-msgid "m_n_mssfix_desc"
+msgid "Fixes problems with unreachable websites, submitting forms or other unexpected behaviour for some ISPs."
 msgstr ""
 "Fixes problems with unreachable websites, submitting forms or other "
 "unexpected behaviour for some ISPs."
 
 #. Flash Firmware
 #: i18n/english/luasrc/i18n/admin-core.en.lua:400
-msgid "admin_upgrade"
+msgid "Flash Firmware"
 msgstr "Flash Firmware"
 
 #. The uploaded image file does not contain a supported format. Make sure that you choose the generic image format for your platform.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:401
-msgid "admin_upgrade_badimage"
+msgid "The uploaded image file does not contain a supported format. Make sure that you choose the generic image format for your platform."
 msgstr ""
 "The uploaded image file does not contain a supported format. Make sure that "
 "you choose the generic image format for your platform."
 
 #. Checksum
 #: i18n/english/luasrc/i18n/admin-core.en.lua:402
-msgid "admin_upgrade_checksum"
+msgid "Checksum"
 msgstr "Checksum"
 
 #. Upload an OpenWrt image file to reflash the device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:403
-msgid "admin_upgrade_desc"
+msgid "Upload an OpenWrt image file to reflash the device."
 msgstr "Upload an OpenWrt image file to reflash the device."
 
 #. Size
 #: i18n/english/luasrc/i18n/admin-core.en.lua:404
-msgid "admin_upgrade_filesize"
+msgid "Size"
 msgstr "Size"
 
 #. Firmware image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:405
-msgid "admin_upgrade_fwimage"
+msgid "Firmware image"
 msgstr "Firmware image"
 
 #. Keep configuration files
 #: i18n/english/luasrc/i18n/admin-core.en.lua:406
-msgid "admin_upgrade_keepcfg"
+msgid "Keep configuration files"
 msgstr "Keep configuration files"
 
 #. Sorry. OpenWrt does not support a system upgrade on this platform.<br /> You need to manually flash your device.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:407
-msgid "admin_upgrade_nosupport"
+msgid "Sorry. OpenWrt does not support a system upgrade on this platform.<br /> You need to manually flash your device."
 msgstr ""
 "Sorry. OpenWrt does not support a system upgrade on this platform.<br /> You "
 "need to manually flash your device."
 
 #. The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes until you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings.
 #: i18n/english/luasrc/i18n/admin-core.en.lua:408
-msgid "admin_upgrade_running"
+msgid "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes until you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings."
 msgstr ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
 "few minutes until you try to reconnect. It might be necessary to renew the "
@@ -2195,19 +2195,19 @@ msgstr ""
 
 #.  (%s available)
 #: i18n/english/luasrc/i18n/admin-core.en.lua:409
-msgid "admin_upgrade_spaceavail"
+msgid " (%s available)"
 msgstr " (%s available)"
 
 #. It appears that you try to flash an image that does not fit into the flash memory, please verify the image file!
 #: i18n/english/luasrc/i18n/admin-core.en.lua:410
-msgid "admin_upgrade_toolarge"
+msgid "It appears that you try to flash an image that does not fit into the flash memory, please verify the image file!"
 msgstr ""
 "It appears that you try to flash an image that does not fit into the flash "
 "memory, please verify the image file!"
 
 #. Upload image
 #: i18n/english/luasrc/i18n/admin-core.en.lua:411
-msgid "admin_upgrade_upload"
+msgid "Upload image"
 msgstr "Upload image"
 
 #. The flash image was uploaded. Below is the checksum and file size listed, compare them with the original file to ensure data integrity.<br /> Click \"Proceed\" below to start the flash procedure.