mirror of
https://github.com/2OOP/pism.git
synced 2026-02-04 02:44:50 +00:00
broken merge
This commit is contained in:
1
.idea/resourceBundles.xml
generated
1
.idea/resourceBundles.xml
generated
@@ -18,6 +18,7 @@
|
||||
<file url="file://$PROJECT_DIR$/app/src/main/resources/assets/localization/localization_ka.properties" />
|
||||
<file url="file://$PROJECT_DIR$/app/src/main/resources/assets/localization/localization_ko.properties" />
|
||||
<file url="file://$PROJECT_DIR$/app/src/main/resources/assets/localization/localization_nl.properties" />
|
||||
<file url="file://$PROJECT_DIR$/app/src/main/resources/assets/localization/localization_ru.properties" />
|
||||
<file url="file://$PROJECT_DIR$/app/src/main/resources/assets/localization/localization_zh.properties" />
|
||||
<custom-resource-bundle>
|
||||
<file value="file://$PROJECT_DIR$/app/src/main/resources/assets/localization/Localization_de.properties" />
|
||||
|
||||
Reference in New Issue
Block a user