Skip to content

Commit

Permalink
XWIKI-22740: "RTFrontend" appears in the Navigation Panel when activa…
Browse files Browse the repository at this point in the history
…ting hidden pages
  • Loading branch information
mflorea committed Dec 21, 2024
1 parent 53e4ecc commit f4e5eb2
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 470 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,10 @@ realtime.lag=Lag
realtime.allowRealtime=Allow Realtime Collaboration
realtime.sessionInProgress=A Realtime Editor session is in progress:
realtime.saved=Saved: v{0}
realtime.mergeOverwrite=Overwrote the realtime session's content with the latest saved state
realtime.savedRemote=v{0} saved by {1}
realtime.conflictResolved=merge conflict resolved remotely, now v{0}
realtime.mergeDialog.prompt=A change was made to the document outside of the realtime session, and the server had difficulty merging it with your version. How would you like to handle this?
realtime.mergeDialog.keepRealtime=Overwrite all changes with the current realtime version
realtime.mergeDialog.keepRemote=Overwrite all changes with the current remote version
realtime.redirectDialog.pluralPrompt=Different Realtime sessions already exist for that document. Which session do you want to join?
realtime.redirectDialog.create=Request a new realtime {0} session
realtime.redirectDialog.join=Join the realtime {0} session
realtime.waiting=Waiting for an answer
realtime.requestASession=The document is locked by another user. Do you want to request a collaborative session?
realtime.requestDialog.prompt=Someone wants to edit this document with you. Would you like to create a collaborative session?
realtime.requestDialog.create=Save and create a {0} collaborative session
Expand All @@ -69,16 +63,13 @@ realtime.wsErrorConflicts=You risk losing content if other users edit the docume
realtime.connectingBox=Connecting to the collaborative session. Please wait...
realtime.connectionLost=You've lost the connection to the collaborative session.
realtime.connectionLostInfo=The editor has been set to read-only mode while we try to reconnect.
realtime.forbidden=You're not allowed to create or join a realtime session for this document.
realtime.reloadDialog.prompt=The realtime session was terminated while you were offline. The document is now in read-only mode. You can close this modal and copy your latest changes if they were not saved and then reload the page to edit it again.
realtime.reloadDialog.reload=Reload the page now
realtime.reloadDialog.exit=Close this dialog
realtime.disableDialog.prompt=You are about to leave the collaborative session. If other users are still editing the document, you risk losing content. Do you want to continue?
realtime.disableDialog.ok=Leave the collaborative session
realtime.disableDialog.exit=Cancel
realtime.versionDialog.prompt=The document has been modified since you last saved it. Please copy your changes and reload the page to get the latest version.
realtime.versionDialog.old=Your version:
realtime.versionDialog.latest=Latest version:
realtime.versionDialog.link=View differences
realtime.autoAcceptSave=Auto-save when switching to a collaborative session
realtime.editor.getContentFailed=Failed to get the edited content. You should try to copy your changes and reload the editor.

Expand All @@ -105,7 +96,17 @@ realtime.savedRemoteNoMerge=v{0} saved by {1} in {2} - Save here to merge the co
#######################################
## since 15.10.16, 16.4.7, 16.10.2
#######################################
realtime.mergeOverwrite=Overwrote the realtime session's content with the latest saved state
realtime.conflictResolved=merge conflict resolved remotely, now v{0}
realtime.mergeDialog.prompt=A change was made to the document outside of the realtime session, and the server had difficulty merging it with your version. How would you like to handle this?
realtime.mergeDialog.keepRealtime=Overwrite all changes with the current realtime version
realtime.mergeDialog.keepRemote=Overwrite all changes with the current remote version
realtime.waiting=Waiting for an answer
realtime.wsErrorInfo=You won't be warned if other users want to edit the document collaboratively and you can't join a collaborative session.
realtime.versionDialog.prompt=The document has been modified since you last saved it. Please copy your changes and reload the page to get the latest version.
realtime.versionDialog.old=Your version:
realtime.versionDialog.latest=Latest version:
realtime.versionDialog.link=View differences

## Used to indicate where deprecated keys end
#@deprecatedend

This file was deleted.

Loading

0 comments on commit f4e5eb2

Please sign in to comment.