From b799d26a10ff947f0089fb63482dc4275fdcaf89 Mon Sep 17 00:00:00 2001 From: "mathieu.brunot" Date: Sun, 11 Aug 2019 01:08:10 +0200 Subject: [PATCH] :truck: Change translation keys to avoid conflicts Signed-off-by: mathieu.brunot --- frontend/src/uxbox/main/locales/en.cljs | 16 ++++++++-------- frontend/src/uxbox/main/locales/fr.cljs | 18 +++++++++--------- .../main/ui/workspace/sidebar/drawtools.cljs | 2 +- .../main/ui/workspace/sidebar/history.cljs | 6 +++--- .../uxbox/main/ui/workspace/sidebar/icons.cljs | 2 +- .../main/ui/workspace/sidebar/layers.cljs | 2 +- .../main/ui/workspace/sidebar/options.cljs | 2 +- .../main/ui/workspace/sidebar/sitemap.cljs | 2 +- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/frontend/src/uxbox/main/locales/en.cljs b/frontend/src/uxbox/main/locales/en.cljs index ce54d2009..f74554a07 100644 --- a/frontend/src/uxbox/main/locales/en.cljs +++ b/frontend/src/uxbox/main/locales/en.cljs @@ -81,19 +81,19 @@ "ds.accept" "Accept" "ds.cancel" "Cancel" - "ds.icons" "Icons" - "ds.element-options" "Element options" - "ds.draw-tools" "Draw tools" - "ds.sitemap" "Sitemap" - "ds.layers" "Layers" - "ds.document-history" "Document history" + "ds.settings.icons" "Icons" + "ds.settings.element-options" "Element options" + "ds.settings.draw-tools" "Draw tools" + "ds.settings.sitemap" "Sitemap" + "ds.settings.layers" "Layers" + "ds.settings.document-history" "Document history" "ds.page.placeholder" "Page name" "ds.page.new" "New page" "ds.page.edit" "Edit page" - "ds.history-versions" "History" - "ds.pinned-version" "Pinned" + "ds.history.versions" "History" + "ds.history.pinned" "Pinned" "ds.help.rect" "Box (Ctrl + B)" "ds.help.circle" "Circle (Ctrl + E)" diff --git a/frontend/src/uxbox/main/locales/fr.cljs b/frontend/src/uxbox/main/locales/fr.cljs index 910267301..e8a70967d 100644 --- a/frontend/src/uxbox/main/locales/fr.cljs +++ b/frontend/src/uxbox/main/locales/fr.cljs @@ -76,24 +76,24 @@ "ds.width" "Largeur" "ds.height" "Hauteur" - "ds.go" "Go go go!" + "ds.go" "C'est parti !" "ds.accept" "Accepter" "ds.cancel" "Annuler" - "ds.icons" "Icônes" - "ds.element-options" "Options d'élément" - "ds.draw-tools" "Outils de dessin" - "ds.sitemap" "Plan du site" - "ds.layers" "Couches" - "ds.document-history" "Historique du document" + "ds.settings.icons" "Icônes" + "ds.settings.element-options" "Options d'élément" + "ds.settings.draw-tools" "Outils de dessin" + "ds.settings.sitemap" "Plan du site" + "ds.settings.layers" "Couches" + "ds.settings.document-history" "Historique du document" "ds.page.placeholder" "Nom de la page" "ds.page.new" "Nouvelle page" "ds.page.edit" "Éditer la page" - "ds.history-versions" "Historique" - "ds.pinned-version" "Épinglés" + "ds.history.versions" "Historique" + "ds.history.pinned" "Épinglés" "ds.help.rect" "Boîte (Ctrl + B)" "ds.help.circle" "Cercle (Ctrl + E)" diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/drawtools.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/drawtools.cljs index b80ac6898..6bc363213 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/drawtools.cljs +++ b/frontend/src/uxbox/main/ui/workspace/sidebar/drawtools.cljs @@ -94,7 +94,7 @@ [:div#form-tools.tool-window.drawing-tools [:div.tool-window-bar [:div.tool-window-icon i/window] - [:span (tr "ds.draw-tools")] + [:span (tr "ds.settings.draw-tools")] [:div.tool-window-close {:on-click close} i/close]] [:div.tool-window-content (for [[i props] (map-indexed vector tools)] diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/history.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/history.cljs index bc3ea9fcd..afc6a8bf5 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/history.cljs +++ b/frontend/src/uxbox/main/ui/workspace/sidebar/history.cljs @@ -102,16 +102,16 @@ [:div.document-history.tool-window {} [:div.tool-window-bar {} [:div.tool-window-icon {} i/undo-history] - [:span {} (tr "ds.document-history")] + [:span {} (tr "ds.settings.document-history")] [:div.tool-window-close {:on-click close} i/close]] [:div.tool-window-content {} [:ul.history-tabs {} [:li {:on-click show-main :class (when main? "selected")} - (tr "ds.history-versions")] + (tr "ds.history.versions")] [:li {:on-click show-pinned :class (when pinned? "selected")} - (tr "ds.pinned-version")]] + (tr "ds.history.pinned")]] (if (= section :pinned) (history-pinned-list history) (history-list history))]]))) diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/icons.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/icons.cljs index ebb06f6b0..2e72d9695 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/icons.cljs +++ b/frontend/src/uxbox/main/ui/workspace/sidebar/icons.cljs @@ -71,7 +71,7 @@ [:div#form-figures.tool-window [:div.tool-window-bar [:div.tool-window-icon i/icon-set] - [:span (tr "ds.icons")] + [:span (tr "ds.settings.icons")] [:div.tool-window-close {:on-click on-close} i/close]] [:div.tool-window-content [:div.figures-catalog diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs index 03c65df39..c3b803771 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs +++ b/frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs @@ -169,7 +169,7 @@ [:div#layers.tool-window [:div.tool-window-bar [:div.tool-window-icon i/layers] - [:span (tr "ds.layers")] + [:span (tr "ds.settings.layers")] [:div.tool-window-close {:on-click on-click} i/close]] [:& layers-list {:shapes (:shapes page) :selected selected}]])) diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/options.cljs index 8c6c18e61..2cb9008c3 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/options.cljs +++ b/frontend/src/uxbox/main/ui/workspace/sidebar/options.cljs @@ -114,7 +114,7 @@ [:div.elementa-options.tool-window [:div.tool-window-bar [:div.tool-window-icon i/options] - [:span (tr "ds.element-options")] + [:span (tr "ds.settings.element-options")] [:div.tool-window-close {:on-click close} i/close]] [:div.tool-window-content [:div.element-options diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/sitemap.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/sitemap.cljs index 0b98a1ea4..20dd38fb4 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/sitemap.cljs +++ b/frontend/src/uxbox/main/ui/workspace/sidebar/sitemap.cljs @@ -105,7 +105,7 @@ [:div.sitemap.tool-window [:div.tool-window-bar [:div.tool-window-icon i/project-tree] - [:span (tr "ds.sitemap")] + [:span (tr "ds.settings.sitemap")] [:div.tool-window-close {:on-click close} i/close]] [:div.tool-window-content [:div.project-title