1 files changed, 131 insertions, 0 deletions
diff --git a/backend/locales/de-DE.json b/backend/locales/de-DE.json
index 0967ef42..1dff33b0 100644
--- a/backend/locales/de-DE.json
+++ b/backend/locales/de-DE.json
@@ -1 +1,132 @@
+<<<<<<< HEAD
 {}
+=======
+{
+    "BranchSelect": {
+        "update_channel": {
+            "prerelease": "",
+            "testing": ""
+        }
+    },
+    "Developer": {
+        "disabling": ""
+    },
+    "FilePickerIndex": {
+        "folder": {
+            "select": ""
+        }
+    },
+    "PluginCard": {
+        "plugin_install": "",
+        "plugin_version_label": ""
+    },
+    "PluginInstallModal": {
+        "install": {
+            "button_processing": "",
+            "title": ""
+        },
+        "reinstall": {
+            "button_idle": "",
+            "desc": ""
+        },
+        "update": {
+            "button_idle": "",
+            "desc": ""
+        }
+    },
+    "PluginListIndex": {
+        "no_plugin": "",
+        "reinstall": "",
+        "uninstall": ""
+    },
+    "PluginLoader": {
+        "decky_title": "",
+        "error": "",
+        "plugin_load_error": {
+            "message": ""
+        },
+        "plugin_uninstall": {
+            "button": "",
+            "title": ""
+        }
+    },
+    "RemoteDebugging": {
+        "remote_cef": {
+            "desc": ""
+        }
+    },
+    "SettingsDeveloperIndex": {
+        "header": "",
+        "react_devtools": {
+            "ip_label": ""
+        },
+        "third_party_plugins": {
+            "button_install": "",
+            "header": "",
+            "label_url": ""
+        },
+        "toast_zip": {
+            "body": ""
+        },
+        "valve_internal": {
+            "desc1": "",
+            "label": ""
+        }
+    },
+    "SettingsGeneralIndex": {
+        "about": {
+            "header": ""
+        },
+        "developer_mode": {
+            "desc": ""
+        },
+        "other": {
+            "header": ""
+        }
+    },
+    "SettingsIndex": {
+        "developer_title": "",
+        "navbar_settings": ""
+    },
+    "Store": {
+        "store_contrib": {
+            "desc": ""
+        },
+        "store_filter": {
+            "label": ""
+        },
+        "store_search": {
+            "label": ""
+        },
+        "store_sort": {
+            "label_def": ""
+        },
+        "store_source": {
+            "label": ""
+        },
+        "store_tabs": {
+            "alph_asce": "",
+            "title": ""
+        }
+    },
+    "StoreSelect": {
+        "custom_store": {
+            "label": ""
+        },
+        "store_channel": {
+            "custom": "",
+            "label": ""
+        }
+    },
+    "Updater": {
+        "decky_updates": "",
+        "patch_notes_desc": "",
+        "updates": {
+            "checking": "",
+            "install_button": "",
+            "lat_version": "",
+            "updating": ""
+        }
+    }
+}
+>>>>>>> 74d06aa (Update translation files)