Re-organise string resources

1 files changed, 8 insertions, 18 deletions

diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 074e3a0..0f9985d 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -20,24 +20,14 @@
 -->
 
 <resources>
-        <string name="app_name">Tinc-app</string>
-        <string name="app_label">Tinc</string>
-        <string name="app_short_desc">Android-binding og brukergrensesnitt tiltenkt maskenett-VPN-nissen for Tinc.</string>
-        <string name="app_copyright">Opphavsrett © 2017–2018 Pacien TRAN-GIRARD.</string>  <!-- TODO: add "and contributors" -->
-        <string name="app_license">Programvare distribuert i henhold til vilkårene i GNU General Public Lisens v3.</string>
-        <string name="app_website_url">https://tincapp.pacien.org</string>
-
-        <string name="info_version_format">Programversjon %1$s (%2$s build)</string>
-        <string name="info_running_on_format">Kjører på Android %1$s %2$s</string>
-        <string name="info_supported_abis_format">Enhets-binærkompabilitet: %1$s</string>
-
-        <string name="menu_about">Om</string>
-
+        <string name="about_app_short_desc">Android-binding og brukergrensesnitt tiltenkt maskenett-VPN-nissen for Tinc.</string>
+        <string name="about_app_license">Programvare distribuert i henhold til vilkårene i GNU General Public Lisens v3.</string>
+        <string name="about_app_version_format">Programversjon %1$s (%2$s build)</string>
+        <string name="about_app_running_on_format">Kjører på Android %1$s %2$s</string>
+        <string name="about_app_supported_abis_format">Enhets-binærkompabilitet: %1$s</string>
+        <string name="about_app_menu_about">Om</string>
         <string name="configure_tools_generate_config_net_name_hint">Tinc-nettverksnavn</string>
-
         <string name="start_network_list_title">Koble til nettverk</string>
-        <string name="title_request_vpn_permissions">Forespør VPN-tilganger</string>
-
-        <string name="action_close">Lukk</string>
-        <string name="action_open_project_website">Prosjektets nettside</string>
+        <string name="generic_action_close">Lukk</string>
+        <string name="about_app_open_project_website">Prosjektets nettside</string>
 </resources>