From 90123c35ae2613c041526ac867f04ecd3b42c519 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Fri, 18 Sep 2015 12:09:43 -0700 Subject: [PATCH] Update translation strings This was all driven by commit 5ba74130c090 ("Cloud storage: make user visible messages more consistent"). Signed-off-by: Dirk Hohndel --- translations/subsurface_source.ts | 70 +++++++++++++------------------ 1 file changed, 29 insertions(+), 41 deletions(-) diff --git a/translations/subsurface_source.ts b/translations/subsurface_source.ts index 39d12ff9d..444eadcce 100644 --- a/translations/subsurface_source.ts +++ b/translations/subsurface_source.ts @@ -9219,73 +9219,61 @@ Is the Uemis Zurich plugged in correctly? - - - Remote storage and local data diverged. Error: can't get commit (%s) - - - - - Remote storage and local data diverged. Error: failed local tree lookup (%s) - - - - - Remote storage and local data diverged. Error: failed remote tree lookup (%s) - - - - - Remote storage and local data diverged. Error: can't get commit: (%s) - - - - - Remote storage and local data diverged. Error: failed base tree lookup: (%s) - - - - + Remote storage and local data diverged. Error: merge failed (%s) - - Remote storage and local data diverged. Error: merge conflict - manual intervention needed + + Local cache directory %s corrupted - can't sync with Subsurface cloud storage - - Remote storage and local data diverged. Error: writing the tree failed (%s) + + + Could not update local cache to newer remote data - - Remote storage and local data diverged. Error: tree lookup failed (%s) + + Subsurface cloud storage corrupted - - Failed to get author: (%s) + + Could not update Subsurface cloud storage, try again later - - Remote storage and local data diverged. Error: git commit create failed (%s) + + Remote storage and local data diverged. Cannot combine local and remote changes - - Error: could not lookup the merge commit I just created (%s) + + Remote storage and local data diverged - + + Remote storage and local data diverged. Error: writing the data failed (%s) + + + + + + + + Problems with local cache of Subsurface cloud data + + + + Error connecting to Subsurface cloud storage - + git clone of %s failed (%s)