Merge remote-tracking branch 'origin/development' into development

This commit is contained in:
Vincent Breitmoser
2015-01-31 18:49:54 +01:00
49 changed files with 3226 additions and 1375 deletions

View File

@@ -489,6 +489,7 @@
<string name="api_settings_package_name">"Package Name"</string>
<string name="api_settings_package_signature">"SHA-256 of Package Signature"</string>
<string name="api_settings_accounts">"Accounts"</string>
<string name="api_settings_allowed_keys">"Allowed Keys"</string>
<string name="api_settings_settings">"Settings"</string>
<string name="api_settings_key">"Account key:"</string>
<string name="api_settings_accounts_empty">"No accounts attached to this app."</string>