diff options
Diffstat (limited to 'launcher/minecraft')
| -rw-r--r-- | launcher/minecraft/WorldList.cpp | 6 | ||||
| -rw-r--r-- | launcher/minecraft/mod/ModFolderModel.cpp | 4 | ||||
| -rw-r--r-- | launcher/minecraft/mod/ResourceFolderModel.cpp | 4 | ||||
| -rw-r--r-- | launcher/minecraft/mod/ResourcePackFolderModel.cpp | 4 | 
4 files changed, 9 insertions, 9 deletions
| diff --git a/launcher/minecraft/WorldList.cpp b/launcher/minecraft/WorldList.cpp index 1262fa1d..43733110 100644 --- a/launcher/minecraft/WorldList.cpp +++ b/launcher/minecraft/WorldList.cpp @@ -213,7 +213,7 @@ QVariant WorldList::data(const QModelIndex &index, int role) const          case InfoColumn:              if (world.isSymLinkUnder(instDirPath())) { -                return tr("This world is symbolicly linked from elsewhere."); +                return tr("This world is symbolically linked from elsewhere.");              }              if (world.isMoreThanOneHardLink()) {                  return tr("\nThis world is hard linked elsewhere."); @@ -237,11 +237,11 @@ QVariant WorldList::data(const QModelIndex &index, int role) const      {             if (column == InfoColumn) {              if (world.isSymLinkUnder(instDirPath())) { -                return tr("Warning: This world is symbolicly linked from elsewhere. Editing it will also change the origonal") + +                return tr("Warning: This world is symbolically linked from elsewhere. Editing it will also change the original") +                         tr("\nCanonical Path: %1").arg(world.canonicalFilePath());              }              if (world.isMoreThanOneHardLink()) { -                return tr("Warning: This world is hard linked elsewhere. Editing it will also change the origonal"); +                return tr("Warning: This world is hard linked elsewhere. Editing it will also change the original");              }          }          return world.folderName(); diff --git a/launcher/minecraft/mod/ModFolderModel.cpp b/launcher/minecraft/mod/ModFolderModel.cpp index e2053f92..943f30ad 100644 --- a/launcher/minecraft/mod/ModFolderModel.cpp +++ b/launcher/minecraft/mod/ModFolderModel.cpp @@ -104,12 +104,12 @@ QVariant ModFolderModel::data(const QModelIndex &index, int role) const          if (column == NAME_COLUMN) {              if (at(row)->isSymLinkUnder(instDirPath())) {                  return m_resources[row]->internal_id() + -                    tr("\nWarning: This resource is symbolicly linked from elsewhere. Editing it will also change the origonal") + +                    tr("\nWarning: This resource is symbolically linked from elsewhere. Editing it will also change the original") +                      tr("\nCanonical Path: %1").arg(at(row)->fileinfo().canonicalFilePath());              }              if (at(row)->isMoreThanOneHardLink()) {                  return m_resources[row]->internal_id() + -                    tr("\nWarning: This resource is hard linked elsewhere. Editing it will also change the origonal"); +                    tr("\nWarning: This resource is hard linked elsewhere. Editing it will also change the original");              }          }          return m_resources[row]->internal_id(); diff --git a/launcher/minecraft/mod/ResourceFolderModel.cpp b/launcher/minecraft/mod/ResourceFolderModel.cpp index d1748c1c..95b7651f 100644 --- a/launcher/minecraft/mod/ResourceFolderModel.cpp +++ b/launcher/minecraft/mod/ResourceFolderModel.cpp @@ -424,12 +424,12 @@ QVariant ResourceFolderModel::data(const QModelIndex& index, int role) const              if (column == NAME_COLUMN) {                  if (at(row).isSymLinkUnder(instDirPath())) {                      return m_resources[row]->internal_id() + -                        tr("\nWarning: This resource is symbolicly linked from elsewhere. Editing it will also change the origonal") + +                        tr("\nWarning: This resource is symbolically linked from elsewhere. Editing it will also change the original") +                          tr("\nCanonical Path: %1").arg(at(row).fileinfo().canonicalFilePath());;                  }                  if (at(row).isMoreThanOneHardLink()) {                      return m_resources[row]->internal_id() + -                        tr("\nWarning: This resource is hard linked elsewhere. Editing it will also change the origonal"); +                        tr("\nWarning: This resource is hard linked elsewhere. Editing it will also change the original");                  }              } diff --git a/launcher/minecraft/mod/ResourcePackFolderModel.cpp b/launcher/minecraft/mod/ResourcePackFolderModel.cpp index 56584a34..1fcfa909 100644 --- a/launcher/minecraft/mod/ResourcePackFolderModel.cpp +++ b/launcher/minecraft/mod/ResourcePackFolderModel.cpp @@ -96,12 +96,12 @@ QVariant ResourcePackFolderModel::data(const QModelIndex& index, int role) const              if (column == NAME_COLUMN) {                  if (at(row)->isSymLinkUnder(instDirPath())) {                      return m_resources[row]->internal_id() + -                        tr("\nWarning: This resource is symbolicly linked from elsewhere. Editing it will also change the origonal") + +                        tr("\nWarning: This resource is symbolically linked from elsewhere. Editing it will also change the original") +                          tr("\nCanonical Path: %1").arg(at(row)->fileinfo().canonicalFilePath());;                  }                  if (at(row)->isMoreThanOneHardLink()) {                      return m_resources[row]->internal_id() + -                        tr("\nWarning: This resource is hard linked elsewhere. Editing it will also change the origonal"); +                        tr("\nWarning: This resource is hard linked elsewhere. Editing it will also change the original");                  }              }              return m_resources[row]->internal_id(); | 
