strings
This commit is contained in:
parent
718e418d30
commit
15669ba5a9
|
|
@ -127,40 +127,19 @@
|
|||
</select>
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="refs #4815 serial">
|
||||
<change afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_collection_new.xml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/src/main/res/layout/sale_row_fragment_test.xml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/src/main/res/layout/testing.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/modules/app/Gestor_Almacén.app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/app/Gestor_Almacén.app.iml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/vn-warehouseManager.iml" beforeDir="false" />
|
||||
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="version 23.40Beta">
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/beta/release/output-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/beta/release/output-metadata.json" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SalixService.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SalixService.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesViewModel.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/common/SalixBackItems.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/common/SalixBackItems.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/component/CustomDialogDynamicButtons.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/component/CustomDialogDynamicButtons.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPicker.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPicker.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPreChecker.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPreChecker.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/mapper/CollectionMapper.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/mapper/CollectionMapper.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelvinglog/model/ShelvingLog.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelvinglog/model/ShelvingLog.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/model/ItemProposal.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/model/ItemProposal.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorViewModel.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/mapper/SacadoresMapper.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/mapper/SacadoresMapper.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/model/TicketItemVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/model/TicketItemVO.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/model/mistakeWorkerType.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/model/mistakeWorkerType.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/values-es/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-es/strings.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/values-fr/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-fr/strings.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/values-pt/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-pt/strings.xml" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
|
|
@ -174,7 +153,7 @@
|
|||
<component name="CodeInsightWorkspaceSettings">
|
||||
<option name="optimizeImportsOnTheFly" value="true" />
|
||||
</component>
|
||||
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\sergiodt\.android\avd\Pixel_6_API_30.avd]" />
|
||||
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[21114523025303]" />
|
||||
<component name="ExportToHTMLSettings">
|
||||
<option name="OPEN_IN_BROWSER" value="true" />
|
||||
<option name="OUTPUT_DIRECTORY" value="C:\Program Files\Android\Android Studio\inspections" />
|
||||
|
|
@ -499,34 +478,6 @@
|
|||
<option name="presentableId" value="Default" />
|
||||
<updated>1618825571576</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00144" summary="refs #5513 testBack">
|
||||
<created>1685541609674</created>
|
||||
<option name="number" value="00144" />
|
||||
<option name="presentableId" value="LOCAL-00144" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1685541609674</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00145" summary="refs #5618 traducción">
|
||||
<created>1685541667220</created>
|
||||
<option name="number" value="00145" />
|
||||
<option name="presentableId" value="LOCAL-00145" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1685541667220</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00146" summary="refs lentitud al leer codigos y fallo al volver atrás">
|
||||
<created>1685541714867</created>
|
||||
<option name="number" value="00146" />
|
||||
<option name="presentableId" value="LOCAL-00146" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1685541714867</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00147" summary="refs #4678 preparar fallo conexión">
|
||||
<created>1685541752286</created>
|
||||
<option name="number" value="00147" />
|
||||
<option name="presentableId" value="LOCAL-00147" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1685541752286</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00148" summary="version alfa">
|
||||
<created>1685541821392</created>
|
||||
<option name="number" value="00148" />
|
||||
|
|
@ -842,7 +793,35 @@
|
|||
<option name="project" value="LOCAL" />
|
||||
<updated>1696924964121</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="193" />
|
||||
<task id="LOCAL-00193" summary="refs #6061 silex→salix">
|
||||
<created>1696925144125</created>
|
||||
<option name="number" value="00193" />
|
||||
<option name="presentableId" value="LOCAL-00193" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1696925144125</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00194" summary="refs #5890 newSacador">
|
||||
<created>1696925238995</created>
|
||||
<option name="number" value="00194" />
|
||||
<option name="presentableId" value="LOCAL-00194" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1696925238995</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00195" summary="refs #4815 ajustesSerial">
|
||||
<created>1696925265470</created>
|
||||
<option name="number" value="00195" />
|
||||
<option name="presentableId" value="LOCAL-00195" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1696925265470</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00196" summary="version 23.40Beta">
|
||||
<created>1696925283229</created>
|
||||
<option name="number" value="00196" />
|
||||
<option name="presentableId" value="LOCAL-00196" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1696925283229</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="197" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="Vcs.Log.History.Properties">
|
||||
|
|
@ -943,10 +922,6 @@
|
|||
</component>
|
||||
<component name="VcsManagerConfiguration">
|
||||
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
|
||||
<MESSAGE value="refs #5613 renew token" />
|
||||
<MESSAGE value="refs #5891" />
|
||||
<MESSAGE value="versionBeta 23.28 renovarToken" />
|
||||
<MESSAGE value="refs #4676 delivery->picking" />
|
||||
<MESSAGE value="refs ##5613 login" />
|
||||
<MESSAGE value="version 23.28 general y beta" />
|
||||
<MESSAGE value="refs #5891 inventoryParking" />
|
||||
|
|
@ -968,7 +943,11 @@
|
|||
<MESSAGE value="refs #5890" />
|
||||
<MESSAGE value="refs #6183" />
|
||||
<MESSAGE value="refs #4815 serial" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="refs #4815 serial" />
|
||||
<MESSAGE value="refs #6061 silex→salix" />
|
||||
<MESSAGE value="refs #5890 newSacador" />
|
||||
<MESSAGE value="refs #4815 ajustesSerial" />
|
||||
<MESSAGE value="version 23.40Beta" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="version 23.40Beta" />
|
||||
</component>
|
||||
<component name="XDebuggerManager">
|
||||
<breakpoint-manager>
|
||||
|
|
|
|||
|
|
@ -548,7 +548,7 @@
|
|||
<string name="deleteQuantity">Va a eliminar para Autoconsumo la cantidad del artículo:</string>
|
||||
<string name="tickets">" Tickets:"</string>
|
||||
<string name="problemUpdate">No es posible actualizar. Problema con la descarga de la app</string>
|
||||
<string name="printPreviousGroup">Introduce el número de previa a imprimir</string>
|
||||
<string name="printPreviousGroup">Introduce el número de ticket de previa a imprimir</string>
|
||||
<string name="print">Imprimir</string>
|
||||
<string name="errorInput">Elemento introducido no válido</string>
|
||||
<string name="titlePackingHolland">Packing Holanda</string>
|
||||
|
|
|
|||
|
|
@ -548,7 +548,7 @@
|
|||
<string name="deleteQuantity">Va a eliminar para Autoconsumo la cantidad del artículo:</string>
|
||||
<string name="tickets">" Tickets:"</string>
|
||||
<string name="problemUpdate">No es posible actualizar. Problema con la descarga de la app</string>
|
||||
<string name="printPreviousGroup">Introduce el número de previa a imprimir</string>
|
||||
<string name="printPreviousGroup">Introduce el número de ticket de previa a imprimir</string>
|
||||
<string name="print">Imprimir</string>
|
||||
<string name="errorInput">Elemento introducido no válido</string>
|
||||
<string name="titlePackingHolland">Packing Holanda</string>
|
||||
|
|
|
|||
|
|
@ -548,7 +548,7 @@
|
|||
<string name="deleteQuantity">Va a eliminar para Autoconsumo la cantidad del artículo:</string>
|
||||
<string name="tickets">" Tickets:"</string>
|
||||
<string name="problemUpdate">No es posible actualizar. Problema con la descarga de la app</string>
|
||||
<string name="printPreviousGroup">Introduce el número de previa a imprimir</string>
|
||||
<string name="printPreviousGroup">Introduce el número de ticket de previa a imprimir</string>
|
||||
<string name="print">Imprimir</string>
|
||||
<string name="errorInput">Elemento introducido no válido</string>
|
||||
<string name="titlePackingHolland">Packing Holanda</string>
|
||||
|
|
|
|||
Loading…
Reference in New Issue