@lumiastream/lumia-translations 1.6.9 → 1.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/src/translations/en.translations.json +0 -4
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@lumiastream/lumia-translations",
3
- "version": "1.6.9",
3
+ "version": "1.7.0",
4
4
  "description": "Translations for the lumia stream app en, ar, es, de, nl, sv, fr",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/translations/en.translations.json CHANGED
@@ -4718,7 +4718,6 @@
4718
4718
  "toggle-error": "Failed to toggle plugin: {{error}}",
4719
4719
  "uninstall-confirm-title": "Confirm Uninstall",
4720
4720
  "uninstall-confirm-message": "Are you sure you want to uninstall \"{{name}}\"? This action cannot be undone.",
4721
- <<<<<<< Updated upstream
4722
4721
  "uninstall-confirm": "Yes, Uninstall",
4723
4722
  "marketplace": "Marketplace",
4724
4723
  "install": "Install",
@@ -4838,8 +4837,6 @@
4838
4837
  "updated-relative": "Updated {{time}}",
4839
4838
  "uploaded-relative": "Uploaded {{time}}",
4840
4839
  "view-changelog": "View Changelog"
4841
- =======
4842
- "uninstall-confirm": "Yes, Uninstall"
4843
4840
  },
4844
4841
  "tts": {
4845
4842
  "tab-discover": "Discover",
@@ -4959,6 +4956,5 @@
4959
4956
  "estimated-tts": "TTS characters",
4960
4957
  "estimated-total": "Combined total",
4961
4958
  "limits-not-available": "Usage limits are not available for your account yet."
4962
- >>>>>>> Stashed changes
4963
4959
  }
4964
4960
  }