diff options
| author | stefan-niedermann <info@niedermann.it> | 2019-12-27 15:21:33 +0300 |
|---|---|---|
| committer | stefan-niedermann <info@niedermann.it> | 2019-12-27 15:21:33 +0300 |
| commit | 3c645c6c415d03ee345ec4ac9bb473c06aafb01d (patch) | |
| tree | 2ff5b9e8dd71d79f8394d023696931fe7483233a | |
| parent | fd61d81d1af2056b1bfc5d29df9225b11468eeca (diff) | |
| parent | b47340db452a510b78520578369135ee4c1fa90d (diff) | |
Merge remote-tracking branch 'origin/background-synchronization' into background-synchronization
# Conflicts:
# app/src/main/res/values/strings.xml
| -rw-r--r-- | app/src/main/res/values/strings.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b38df4b49..1207ed33e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -150,11 +150,11 @@ <string name="attachment_delete_message">This will permanently delete this attachment.</string> <string name="delete_attachment">Delete %1$s</string> <string name="no_content">No content yet</string> - <string name="action_card_move">Move card</string> - <string name="action_card_move_title">Move %1$s</string> <string name="last_background_sync">Last background sync:</string> <string name="simple_off">Off</string> <string name="minutes_15">15 Minutes</string> <string name="hour_1">1 Hour</string> <string name="hours_6">6 Hours</string> + <string name="action_card_move">Move card</string> + <string name="action_card_move_title">Move %1$s</string> </resources> |