Component Translated Unfinished Unfinished words Unfinished characters Untranslated Checks Suggestions Comments
Glossary OSGeoLive CC-BY-NC-4.0 0 0 0 0 0 0 0
osgeo_contact CC-BY-NC-4.0 67% 17 26 165 17 2 0 0
metrics CC-BY-NC-4.0 90% 20 93 663 20 45 0 0
sponsors_osgeo CC-BY-NC-4.0 84% 27 146 1,176 27 50 1 0
index CC-BY-NC-4.0 85% 30 162 1,314 30 23 0 0
osgeolive_install_quickstart CC-BY-NC-4.0 89% 41 235 1,621 41 75 0 0
internationalisation_quickstart CC-BY-NC-4.0 84% 37 257 1,691 37 32 0 0
download CC-BY-NC-4.0 86% 29 268 1,770 29 22 0 0
osgeolive_quickstart CC-BY-NC-4.0 80% 75 414 2,922 75 74 0 0
prior_applications CC-BY-NC-4.0 84% 183 342 3,174 183 367 0 0
contact CC-BY-NC-4.0 84% 34 491 3,411 29 27 0 0
t-rex_overview CC-BY-NC-4.0 63% 114 500 4,244 114 35 0 0
ideditor_overview CC-BY-NC-4.0 65% 109 649 5,338 109 22 0 0
pywps_overview CC-BY-NC-4.0 65% 142 701 5,602 142 64 0 0
liblas_overview CC-BY-NC-4.0 71% 64 826 5,876 64 35 0 0
52nWPS_overview CC-BY-NC-4.0 68% 157 731 6,151 157 53 0 0
gmt_overview CC-BY-NC-4.0 62% 107 799 6,593 107 36 0 0
postgis_overview CC-BY-NC-4.0 68% 130 877 6,808 130 46 0 0
xygrib_overview CC-BY-NC-4.0 64% 106 930 6,946 106 31 0 0
geonode_overview CC-BY-NC-4.0 65% 213 938 7,117 213 34 0 0
qgis_mapserver_overview CC-BY-NC-4.0 64% 139 990 7,122 139 53 0 0
actinia_overview CC-BY-NC-4.0 62% 113 752 7,160 110 30 0 0
geonetwork_overview CC-BY-NC-4.0 67% 152 890 7,344 152 71 0 0
netcdf_dataset_overview CC-BY-NC-4.0 61% 85 955 7,797 85 11 0 0
qgis_overview CC-BY-NC-4.0 74% 164 1,054 7,998 164 62 0 0
mapnik_overview CC-BY-NC-4.0 65% 94 1,077 8,061 94 30 0 0
opencpn_overview CC-BY-NC-4.0 62% 141 1,103 8,229 141 44 0 0
geomajas_overview CC-BY-NC-4.0 61% 129 1,128 8,244 129 26 0 0
mapslicer_overview CC-BY-NC-4.0 61% 106 1,170 8,304 106 43 0 0
osm_overview CC-BY-NC-4.0 61% 161 1,162 8,503 161 74 0 0
cesium_overview CC-BY-NC-4.0 68% 144 1,063 8,528 144 27 0 0
gdal_overview CC-BY-NC-4.0 71% 118 1,109 8,574 118 41 0 0
jts_overview CC-BY-NC-4.0 62% 158 1,147 8,655 158 27 0 0
t-rex_quickstart CC-BY-NC-4.0 57% 171 1,348 8,712 171 18 0 0
openlayers_overview CC-BY-NC-4.0 65% 183 1,166 8,818 183 77 0 0
pgrouting_overview CC-BY-NC-4.0 61% 160 1,122 9,041 160 33 0 0
geos_overview CC-BY-NC-4.0 62% 128 1,052 9,141 128 34 0 0
istsos_overview CC-BY-NC-4.0 63% 137 1,211 9,258 137 41 0 0
cesium_quickstart CC-BY-NC-4.0 58% 140 1,399 9,514 135 16 0 0
marble_quickstart CC-BY-NC-4.0 58% 204 1,585 9,691 204 36 0 0
jupyter_overview CC-BY-NC-4.0 57% 164 1,268 10,120 164 30 0 0
mapcache_overview CC-BY-NC-4.0 62% 212 1,389 10,181 212 50 0 0
proj_overview CC-BY-NC-4.0 62% 147 1,156 10,327 147 52 0 0
nc_dataset_overview CC-BY-NC-4.0 59% 158 1,480 10,351 158 35 0 0
josm_overview CC-BY-NC-4.0 61% 188 1,525 10,845 188 63 0 0
usb_quickstart CC-BY-NC-4.0 79% 124 1,699 10,945 124 41 0 0
spatialite_overview CC-BY-NC-4.0 60% 187 1,503 10,998 187 32 0 0
gpsprune_overview CC-BY-NC-4.0 62% 143 1,593 11,100 143 40 0 0
geomoose_overview CC-BY-NC-4.0 62% 165 1,420 11,284 165 49 0 0
mapnik_quickstart CC-BY-NC-4.0 56% 136 1,592 11,626 132 33 0 0
saga_overview CC-BY-NC-4.0 59% 172 1,529 11,872 166 30 0 0
eoxserver_overview CC-BY-NC-4.0 59% 224 1,435 12,015 224 49 0 0
rasdaman_overview CC-BY-NC-4.0 62% 145 1,626 12,148 145 23 0 0
openjump_overview CC-BY-NC-4.0 60% 232 1,677 12,671 232 46 0 0
grass_overview CC-BY-NC-4.0 64% 101 1,740 12,688 101 20 0 0
leaflet_overview CC-BY-NC-4.0 59% 313 1,805 12,965 313 25 0 0
otb_overview CC-BY-NC-4.0 60% 186 1,737 13,189 186 40 0 0
mapbender_overview CC-BY-NC-4.0 60% 189 1,740 13,239 189 41 0 0
re3gistry_overview CC-BY-NC-4.0 60% 169 1,565 13,269 169 31 0 0
zoo-project_quickstart CC-BY-NC-4.0 52% 173 1,987 13,332 173 28 0 0
opencpn_quickstart CC-BY-NC-4.0 56% 174 2,063 13,338 174 26 0 0
liblas_quickstart CC-BY-NC-4.0 64% 79 2,254 13,579 79 16 0 0
naturalearth_overview CC-BY-NC-4.0 59% 151 1,848 13,629 151 44 0 0
pygeoapi_overview CC-BY-NC-4.0 56% 259 1,886 13,728 251 65 0 0
pycsw_overview CC-BY-NC-4.0 60% 331 2,037 14,533 331 70 0 0
marble_overview CC-BY-NC-4.0 60% 186 1,948 14,733 186 41 0 0
qgis_mapserver_quickstart CC-BY-NC-4.0 55% 247 1,864 14,766 243 32 0 0
R_overview CC-BY-NC-4.0 65% 154 2,110 15,163 154 34 0 0
geomajas_quickstart CC-BY-NC-4.0 53% 152 2,088 15,197 152 11 0 0
geostyler_overview CC-BY-NC-4.0 61% 160 2,236 15,232 160 32 0 0
geostyler_quickstart CC-BY-NC-4.0 56% 186 2,228 15,247 186 27 0 0
osm_dataset_overview CC-BY-NC-4.0 59% 157 2,300 15,773 157 33 0 0
udig_overview CC-BY-NC-4.0 61% 233 2,132 15,801 233 97 0 0
pgrouting_quickstart CC-BY-NC-4.0 55% 258 2,333 15,857 258 49 0 0
zoo-project_overview CC-BY-NC-4.0 60% 180 2,258 16,081 180 35 0 0
geoext_overview CC-BY-NC-4.0 50% 240 1,927 16,225 229 49 0 0
geoserver_overview CC-BY-NC-4.0 66% 201 2,510 16,374 201 73 0 0
mapproxy_overview CC-BY-NC-4.0 58% 377 2,303 16,984 377 57 0 0
gmt_quickstart CC-BY-NC-4.0 51% 222 2,605 17,092 222 44 0 0
ogc_overview CC-BY-NC-4.0 56% 79 2,447 17,964 79 10 1 0
52nWPS_quickstart CC-BY-NC-4.0 51% 209 2,336 18,012 209 33 0 0
mapproxy_quickstart CC-BY-NC-4.0 54% 227 2,658 18,102 223 60 0 0
ETF_overview CC-BY-NC-4.0 54% 311 2,468 18,287 311 20 0 0
mapserver_overview CC-BY-NC-4.0 60% 356 2,448 18,809 355 48 0 0
xygrib_quickstart CC-BY-NC-4.0 56% 199 3,153 18,839 199 26 0 0
deegree_quickstart CC-BY-NC-4.0 53% 168 2,823 19,099 168 15 0 0
hyperv_quickstart CC-BY-NC-4.0 72% 160 2,534 19,419 156 105 1 0
gvsig_overview CC-BY-NC-4.0 59% 340 2,652 19,577 340 72 0 0
spatialite_quickstart CC-BY-NC-4.0 55% 230 3,168 19,763 226 30 0 0
proj_quickstart CC-BY-NC-4.0 55% 235 2,987 20,104 235 72 0 0
overview CC-BY-NC-4.0 80% 222 1,736 20,695 217 127 0 0
mapslicer_quickstart CC-BY-NC-4.0 54% 129 3,013 20,920 129 26 0 0
jupyter_quickstart CC-BY-NC-4.0 45% 254 3,458 21,742 254 14 0 0
inspire_overview CC-BY-NC-4.0 59% 101 2,740 21,746 101 34 0 0
deegree_overview CC-BY-NC-4.0 57% 456 2,940 22,099 456 64 0 0
geotools_overview CC-BY-NC-4.0 57% 311 2,962 22,708 311 64 0 0
leaflet_quickstart CC-BY-NC-4.0 57% 226 4,292 25,295 226 28 0 0
geoext_quickstart CC-BY-NC-4.0 55% 190 4,012 25,712 187 28 0 0
gdal_quickstart CC-BY-NC-4.0 63% 394 4,437 26,760 394 54 0 0
rasdaman_quickstart CC-BY-NC-4.0 50% 226 3,636 27,206 226 42 0 0

Overview

Project website live.osgeo.org/en/index.html
Instructions for translators

All these strings are considered non translated when the documentation is generated: marked for edit, with suggestions and untranslated. Please work on this order to have the most translated strings as soon as possible

1) Strings marked for edit - Normally, these are strings that had a very small change. Usually on the link.

2) Strings with suggestions - Are strings that look like other strings.

  • Click on the check mark, if it is exactly what is going to be used
  • Copy/paste the suggestion, and delete the suggestion, if it is similar

3) Untranslated strings - Are strings that do not have a suggestion and have not been translated before.

Translation license CC-BY-NC-4.0 OSGeoLive osgeo_contact metrics sponsors_osgeo index osgeolive_install_quickstart internationalisation_quickstart download osgeolive_quickstart prior_applications contact t-rex_overview ideditor_overview pywps_overview liblas_overview 52nWPS_overview gmt_overview postgis_overview xygrib_overview geonode_overview qgis_mapserver_overview actinia_overview geonetwork_overview netcdf_dataset_overview qgis_overview mapnik_overview opencpn_overview geomajas_overview mapslicer_overview osm_overview cesium_overview gdal_overview jts_overview t-rex_quickstart openlayers_overview pgrouting_overview geos_overview istsos_overview cesium_quickstart marble_quickstart jupyter_overview mapcache_overview proj_overview nc_dataset_overview josm_overview usb_quickstart spatialite_overview gpsprune_overview geomoose_overview mapnik_quickstart saga_overview eoxserver_overview rasdaman_overview openjump_overview grass_overview leaflet_overview otb_overview mapbender_overview re3gistry_overview zoo-project_quickstart opencpn_quickstart liblas_quickstart naturalearth_overview pygeoapi_overview pycsw_overview marble_overview qgis_mapserver_quickstart R_overview geomajas_quickstart geostyler_overview geostyler_quickstart osm_dataset_overview udig_overview pgrouting_quickstart zoo-project_overview geoext_overview geoserver_overview mapproxy_overview gmt_quickstart ogc_overview 52nWPS_quickstart mapproxy_quickstart ETF_overview mapserver_overview xygrib_quickstart deegree_quickstart hyperv_quickstart gvsig_overview spatialite_quickstart proj_quickstart overview mapslicer_quickstart jupyter_quickstart inspire_overview deegree_overview geotools_overview leaflet_quickstart geoext_quickstart gdal_quickstart rasdaman_quickstart
an hour ago

String statistics

Strings percent Hosted strings Words percent Hosted words Characters percent Hosted characters
Total 93,410 927,875 6,285,446
Source 7,224 71,701 486,028
Translated 60% 56,263 52% 490,159 53% 3,367,355
Needs editing 1% 165 1% 3,606 1% 28,593
Read-only 7% 7,224 7% 71,701 7% 486,028
Failing checks 13% 12,573 7% 70,806 8% 536,958
Strings with suggestions 1% 13 1% 105 1% 787
Untranslated strings 39% 36,982 46% 434,110 45% 2,889,498

Quick numbers

927 k
Hosted words
93,410
Hosted strings
60%
Translated
and previous 30 days

Trends of last 30 days

Hosted words
+100%
Hosted strings
+100%
Translated
+60%
−100%
Contributors
+100%
User avatar None

Repository rebased

Repository rebased

Original revision: d21924c61845ae9596a70cf5234f3c0143e712b5
New revision: 2a42ca8fa2e91d3b63a79b95de954e81919f608f 2 days ago
User avatar None

Repository notification received

GitHub: https://github.com/OSGeo/OSGeoLive-doc, master 2 days ago
User avatar None

Alert triggered

Component seems unused. 3 weeks ago
User avatar None

Alert triggered

Component seems unused. 3 weeks ago
User avatar None

Alert triggered

Component seems unused. 3 weeks ago
User avatar None

Repository rebased

Repository rebased

Original revision: 982a20b0f476abd5d2220c577c1ceb8faa640b50
New revision: d21924c61845ae9596a70cf5234f3c0143e712b5 2 months ago
User avatar None

Repository notification received

GitHub: https://github.com/OSGeo/OSGeoLive-doc, master 2 months ago
User avatar cvvergara

Repository rebase failed

warning: skipped previously applied commit 85a7f5e9c
warning: skipped previously applied commit 5fd390204
warning: skipped previously applied commit aa69396c6
warning: skipped previously applied commit 5d68b614d
warning: skipped previously applied commit af1cb5f5f
warning: skipped previously applied commit 8da08b5c4
warning: skipped previously applied commit 5b4c239c7
warning: skipped previously applied commit d85a5c0ed
warning: skipped previously applied commit ecd0d67a4
warning: skipped previously applied commit 83ce6a620
warning: skipped previously applied commit 6a34b82bc
warning: skipped previously applied commit 60d90c3d5
warning: skipped previously applied commit 957031b30
warning: skipped previously applied commit 3c733f2fc
warning: skipped previously applied commit a00a033ba
warning: skipped previously applied commit 0aa2ef650
warning: skipped previously applied commit 2c1054124
warning: skipped previously applied commit 44c25426c
warning: skipped previously applied commit ab77fbc5f
warning: skipped previously applied commit e26595019
warning: skipped previously applied commit e322d60b9
warning: skipped previously applied commit 808afe5b9
warning: skipped previously applied commit 1953178b3
warning: skipped previously applied commit 0b7229410
warning: skipped previously applied commit 71df22a48
warning: skipped previously applied commit c22b3aece
warning: skipped previously applied commit 5a6e49a31
warning: skipped previously applied commit 4e10ad2b7
warning: skipped previously applied commit d4d0f9822
warning: skipped previously applied commit 8d2b4c98e
warning: skipped previously applied commit 80c4b4bd8
warning: skipped previously applied commit 7bab0465f
warning: skipped previously applied commit 1836d61fb
warning: skipped previously applied commit 6888300d9
warning: skipped previously applied commit 8366f421c
warning: skipped previously applied commit 604367bad
warning: skipped previously applied commit 82dbb54a1
warning: skipped previously applied commit faae92695
warning: skipped previously applied commit 994204499
warning: skipped previously applied commit df2522c81
warning: skipped previously applied commit 576163d9b
warning: skipped previously applied commit 522d130a1
warning: skipped previously applied commit 4f5a70f3b
warning: skipped previously applied commit 787c8c69d
warning: skipped previously applied commit 65e5528fc
warning: skipped previously applied commit 6ecf45d01
warning: skipped previously applied commit 36809817c
warning: skipped previously applied commit 46db9f401
warning: skipped previously applied commit 7e42f2930
warning: skipped previously applied commit cf83c5fc6
warning: skipped previously applied commit 931fef87f
warning: skipped previously applied commit 3816d6357
warning: skipped previously applied commit 6bec8aa07
warning: skipped previously applied commit dabd8f031
warning: skipped previously applied commit e4204b9ea
warning: skipped previously applied commit dfe101e38
warning: skipped previously applied commit 8e4aa8fa0
warning: skipped previously applied commit a175b2c06
warning: skipped previously applied commit 5d9f90763
warning: skipped previously applied commit 3fe9e36ef
warning: skipped previously applied commit a8d94c003
warning: skipped previously applied commit 7c1b98fca
warning: skipped previously applied commit 945b9ba3d
warning: skipped previously applied commit f755ea2b4
warning: skipped previously applied commit 4f5c4c345
warning: skipped previously applied commit 458361196
warning: skipped previously applied commit 9883686c0
warning: skipped previously applied commit ac7cbd3e4
warning: skipped previously applied commit ae19aa4dd
warning: skipped previously applied commit 79d2ebd1e
warning: skipped previously applied commit 861d2993a
warning: skipped previously applied commit 3b976196e
warning: skipped previously applied commit 9f4734e66
warning: skipped previously applied commit 733ac4b5e
warning: skipped previously applied commit 102c5bd46
warning: skipped previously applied commit 2d5c91037
warning: skipped previously applied commit 04053748f
warning: skipped previously applied commit 6a1458d1a
warning: skipped previously applied commit abc214a26
warning: skipped previously applied commit cd8a0dfe6
warning: skipped previously applied commit 4ca9dc30d
warning: skipped previously applied commit 0f15c19aa
warning: skipped previously applied commit b93e5bf63
warning: skipped previously applied commit ccd764306
warning: skipped previously applied commit d8d069337
warning: skipped previously applied commit 97443f420
warning: skipped previously applied commit a9c23d52f
warning: skipped previously applied commit 8eaeeb88a
warning: skipped previously applied commit 28dc9a8a4
warning: skipped previously applied commit a91444d3b
warning: skipped previously applied commit 9c6865b57
warning: skipped previously applied commit 3508c9abc
warning: skipped previously applied commit d266f474a
warning: skipped previously applied commit a767573a3
warning: skipped previously applied commit ec3970ec1
warning: skipped previously applied commit d1ac98172
warning: skipped previously applied commit 0afb2508c
warning: skipped previously applied commit ce51c083f
warning: skipped previously applied commit e46cf7327
warning: skipped previously applied commit e0f87f710
warning: skipped previously applied commit 82509af2d
warning: skipped previously applied commit 628c077a7
warning: skipped previously applied commit ba637597a
warning: skipped previously applied commit bdcb067b0
warning: skipped previously applied commit 982a20b0f
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/2)
CONFLICT (modify/delete): locale/ja/LC_MESSAGES/overview/ncWMS_overview.po deleted in HEAD and modified in 8d29eff81 (Translated using Weblate (Japanese)).  Version 8d29eff81 (Translated using Weblate (Japanese)) of locale/ja/LC_MESSAGES/overview/ncWMS_overview.po left in tree.
error: could not apply 8d29eff81... Translated using Weblate (Japanese)
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 8d29eff81... Translated using Weblate (Japanese)
 (1)
2 months ago
User avatar cvvergara

Repository rebase failed

warning: skipped previously applied commit 85a7f5e9c
warning: skipped previously applied commit 5fd390204
warning: skipped previously applied commit aa69396c6
warning: skipped previously applied commit 5d68b614d
warning: skipped previously applied commit af1cb5f5f
warning: skipped previously applied commit 8da08b5c4
warning: skipped previously applied commit 5b4c239c7
warning: skipped previously applied commit d85a5c0ed
warning: skipped previously applied commit ecd0d67a4
warning: skipped previously applied commit 83ce6a620
warning: skipped previously applied commit 6a34b82bc
warning: skipped previously applied commit 60d90c3d5
warning: skipped previously applied commit 957031b30
warning: skipped previously applied commit 3c733f2fc
warning: skipped previously applied commit a00a033ba
warning: skipped previously applied commit 0aa2ef650
warning: skipped previously applied commit 2c1054124
warning: skipped previously applied commit 44c25426c
warning: skipped previously applied commit ab77fbc5f
warning: skipped previously applied commit e26595019
warning: skipped previously applied commit e322d60b9
warning: skipped previously applied commit 808afe5b9
warning: skipped previously applied commit 1953178b3
warning: skipped previously applied commit 0b7229410
warning: skipped previously applied commit 71df22a48
warning: skipped previously applied commit c22b3aece
warning: skipped previously applied commit 5a6e49a31
warning: skipped previously applied commit 4e10ad2b7
warning: skipped previously applied commit d4d0f9822
warning: skipped previously applied commit 8d2b4c98e
warning: skipped previously applied commit 80c4b4bd8
warning: skipped previously applied commit 7bab0465f
warning: skipped previously applied commit 1836d61fb
warning: skipped previously applied commit 6888300d9
warning: skipped previously applied commit 8366f421c
warning: skipped previously applied commit 604367bad
warning: skipped previously applied commit 82dbb54a1
warning: skipped previously applied commit faae92695
warning: skipped previously applied commit 994204499
warning: skipped previously applied commit df2522c81
warning: skipped previously applied commit 576163d9b
warning: skipped previously applied commit 522d130a1
warning: skipped previously applied commit 4f5a70f3b
warning: skipped previously applied commit 787c8c69d
warning: skipped previously applied commit 65e5528fc
warning: skipped previously applied commit 6ecf45d01
warning: skipped previously applied commit 36809817c
warning: skipped previously applied commit 46db9f401
warning: skipped previously applied commit 7e42f2930
warning: skipped previously applied commit cf83c5fc6
warning: skipped previously applied commit 931fef87f
warning: skipped previously applied commit 3816d6357
warning: skipped previously applied commit 6bec8aa07
warning: skipped previously applied commit dabd8f031
warning: skipped previously applied commit e4204b9ea
warning: skipped previously applied commit dfe101e38
warning: skipped previously applied commit 8e4aa8fa0
warning: skipped previously applied commit a175b2c06
warning: skipped previously applied commit 5d9f90763
warning: skipped previously applied commit 3fe9e36ef
warning: skipped previously applied commit a8d94c003
warning: skipped previously applied commit 7c1b98fca
warning: skipped previously applied commit 945b9ba3d
warning: skipped previously applied commit f755ea2b4
warning: skipped previously applied commit 4f5c4c345
warning: skipped previously applied commit 458361196
warning: skipped previously applied commit 9883686c0
warning: skipped previously applied commit ac7cbd3e4
warning: skipped previously applied commit ae19aa4dd
warning: skipped previously applied commit 79d2ebd1e
warning: skipped previously applied commit 861d2993a
warning: skipped previously applied commit 3b976196e
warning: skipped previously applied commit 9f4734e66
warning: skipped previously applied commit 733ac4b5e
warning: skipped previously applied commit 102c5bd46
warning: skipped previously applied commit 2d5c91037
warning: skipped previously applied commit 04053748f
warning: skipped previously applied commit 6a1458d1a
warning: skipped previously applied commit abc214a26
warning: skipped previously applied commit cd8a0dfe6
warning: skipped previously applied commit 4ca9dc30d
warning: skipped previously applied commit 0f15c19aa
warning: skipped previously applied commit b93e5bf63
warning: skipped previously applied commit ccd764306
warning: skipped previously applied commit d8d069337
warning: skipped previously applied commit 97443f420
warning: skipped previously applied commit a9c23d52f
warning: skipped previously applied commit 8eaeeb88a
warning: skipped previously applied commit 28dc9a8a4
warning: skipped previously applied commit a91444d3b
warning: skipped previously applied commit 9c6865b57
warning: skipped previously applied commit 3508c9abc
warning: skipped previously applied commit d266f474a
warning: skipped previously applied commit a767573a3
warning: skipped previously applied commit ec3970ec1
warning: skipped previously applied commit d1ac98172
warning: skipped previously applied commit 0afb2508c
warning: skipped previously applied commit ce51c083f
warning: skipped previously applied commit e46cf7327
warning: skipped previously applied commit e0f87f710
warning: skipped previously applied commit 82509af2d
warning: skipped previously applied commit 628c077a7
warning: skipped previously applied commit ba637597a
warning: skipped previously applied commit bdcb067b0
warning: skipped previously applied commit 982a20b0f
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/2)
CONFLICT (modify/delete): locale/ja/LC_MESSAGES/overview/ncWMS_overview.po deleted in HEAD and modified in 8d29eff81 (Translated using Weblate (Japanese)).  Version 8d29eff81 (Translated using Weblate (Japanese)) of locale/ja/LC_MESSAGES/overview/ncWMS_overview.po left in tree.
error: could not apply 8d29eff81... Translated using Weblate (Japanese)
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 8d29eff81... Translated using Weblate (Japanese)
 (1)
2 months ago
User avatar cvvergara

Repository merge failed

CONFLICT (modify/delete): locale/ja/LC_MESSAGES/overview/ncWMS_overview.po deleted in origin/master and modified in HEAD.  Version HEAD of locale/ja/LC_MESSAGES/overview/ncWMS_overview.po left in tree.
CONFLICT (modify/delete): locale/ja/LC_MESSAGES/quickstart/ncWMS_quickstart.po deleted in origin/master and modified in HEAD.  Version HEAD of locale/ja/LC_MESSAGES/quickstart/ncWMS_quickstart.po left in tree.
Automatic merge failed; fix conflicts and then commit the result.
 (1)
2 months ago
Browse all project changes