diff options
| author | Julius Härtl <jus@bitgrid.net> | 2019-06-17 23:09:33 +0300 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2019-06-17 23:09:33 +0300 |
| commit | 7e74e6d41cfb8efe25a7f666ecb592eac9784060 (patch) | |
| tree | b07f685d16d367c80743858e03ab940e80c4860b /src/components/CollisionResolveDialog.vue | |
| parent | 91f8e8a88df5cd41e113572060a491b92886f308 (diff) | |
Fix loading and translatable strings
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'src/components/CollisionResolveDialog.vue')
| -rw-r--r-- | src/components/CollisionResolveDialog.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/CollisionResolveDialog.vue b/src/components/CollisionResolveDialog.vue index d3ee725ed..b78aded8a 100644 --- a/src/components/CollisionResolveDialog.vue +++ b/src/components/CollisionResolveDialog.vue @@ -23,10 +23,10 @@ <template> <div id="resolve-conflicts" class="collision-resolve-dialog"> <button @click="$emit('resolveUseThisVersion')"> - Use your version + {{ t('text', 'Use current version') }} </button> <button @click="$emit('resolveUseServerVersion')"> - Use the server version + {{ t('text', 'Use the saved version') }} </button> </div> </template> |