Merge branch 'master' into weblate-merge-tmp

Neamar · May 14, 2018 · 82e8c03 · 82e8c03
2 parents 325b06f + cc01300
commit 82e8c03
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -213,5 +213,5 @@
  <string name="colors">Farben</string>
  <string name="black_notification_icons">Schwarze Benachrichtigungssymbole</string>
  <string name="shortcuts_no_host_permission">KISS ist nicht Ihr Haupt-Launcher und hat daher keinen Zugriff auf Ihre Verknüpfungen.</string>
- <string name="unable_add_shortcut">Hinzufügen von Verknüpfungen nicht möglich (Anbieter für „Verknüfungen“ in den KISS-Einstellungen nicht aktiviert)</string>
+ <string name="unable_add_shortcut">Hinzufügen von Verknüpfungen nicht möglich (Anbieter für „Verknüfungen“ in KISS-Einstellungen nicht aktiviert)</string>
 </resources>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
@@ -212,4 +212,8 @@
  <string name="black_notification_icons">Vis merknadsikoner i svart</string>
  <string name="shortcuts_no_host_permission">KISS er ikke din hovedoppstarter lenger, og har ikke tilgang til snarveiene dine.</string>
  <string name="unable_add_shortcut">Kunne ikke legge til snarveier (snarveistilbyder er avskrudd i KISS-innstillingene)</string>
-</resources>
+<string name="wp_animate_center">Sentrer bakgrunn</string>
+ <string name="wp_animate_center_desc">Bakgrunnen vil returnere til senter etter rulling</string>
+ <string name="wp_animate_sides">Fest bakgrunn til siden</string>
+ <string name="wp_animate_sides_desc">Bakgrunnen vil feste seg til venstre eller høyre etter rulling</string>
+ </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -211,7 +211,7 @@
  <string name="get_help">Get help!</string>
  <string name="permission_denied">Permission has been denied</string>
  <string name="colors">Colors</string>
- <string name="black_notification_icons">Display notifications icons in black</string>
+ <string name="black_notification_icons">Display notification icons in black</string>
  <string name="shortcuts_no_host_permission">KISS is not your main launcher anymore and can\'t access your shortcuts.</string>
  <string name="unable_add_shortcut">Unable to add shortcuts (shortcut provider is disabled in KISS settings)</string>
 </resources>