Switch German to Weblate #91

rtsisyk · 2023-01-02T09:13:14Z

This patch overwrites German Markdowns with translations from Weblate. Any further edits should be done through Weblate.

cloudflare-workers-and-pages · 2023-01-02T09:13:23Z

Deploying with Cloudflare Pages

Latest commit:	`09075d3`
Status:	✅ Deploy successful!
Preview URL:	https://f0977936.organicmaps.pages.dev
Branch Preview URL:	https://weblate-de.organicmaps.pages.dev

View logs

rtsisyk · 2023-01-03T20:58:24Z

@organicmaps/translations-de, could you please review @nautilusx work?

rtsisyk · 2023-01-28T09:55:55Z

regenerated, @nautilusx please take a look. I am thinking about merging this PR if nobody else is interested.

content/terms/index.de.md

j13m126 · 2023-01-28T12:21:55Z

I missed this PR, I can have a look at it in the evening if you want to wait.

rtsisyk · 2023-01-28T14:52:28Z

I missed this PR, I can have a look at it in the evening if you want to wait.

Yes, please.

The question here is to switch German to Weblate or not. What do you think?

nautilusx · 2023-01-28T16:30:25Z

@rtsisyk please merged the latest strings from Weblate. There 5 newer translated strings on Weblate. (3 weeks ago)

Please only weblate for translations.

rtsisyk · 2023-01-28T17:22:16Z

@rtsisyk please merged the latest strings from Weblate. There 5 newer translated strings on Weblate. (3 weeks ago)

Please only weblate for translations.

I've just merged all translations and switched Weblate to master branch. German translations are already in master. This PR override original Markdowns and enables generation from Weblate.

rtsisyk · 2023-01-28T18:16:34Z

Re-based to resolve conflicts. No other changes.

j13m126 · 2023-01-28T21:42:16Z

content/_index.de.md

 ---

-**Organic Maps** ist eine kostenlose Offline-Karten-App auf Android und iOS für Reisende, Touristen, Wanderer und Radfahrer auf der Grundlage von gemeinschaftlichen **[OpenStreetMap](https://www.openstreetmap.org)** Daten.
-Es handelt sich um eine datenschutzfreundliche, quelloffene [Abspaltung][fork] der **Maps.me**-App (früher bekannt als [**MapsWithMe**](https://en.wikipedia.org/wiki/Maps.me)), die von denselben Personen gepflegt wird, die **MapsWithMe** im Jahr 2011 entwickelt haben.
+**Organic Maps** ist eine freie und kostenlose Offline-Karten-App für Android und iOS für Reisende, Touristen, Wanderer und Radfahrer, die auf den Daten von **[OpenStreetMap][openstreetmap]** basiert. Es handelt sich um eine datenschutzfreundliche, quelloffene [fork][fork] der **Maps.me** App (früher bekannt als [**MapsWithMe**][mapswithme]), die von denselben Leuten gepflegt wird, die **MapsWithMe** im Jahr 2011 erstellt haben.


... quelloffene [Fork][fork] der ....

Updated on Weblate.

j13m126 · 2023-01-28T21:44:06Z

content/_index.de.md


-Organic Maps ist rein und organisch, mit Liebe gemacht:
+Organic Maps ist rein und nachhaltig, mit Liebe gemacht:


rein, nachhaltig und mit Liebe gemacht:

Updated on Weblate.

Haven't we translated 'organic' with 'organisch' so far?

Let's use Organic Maps in the title and Organisch in other places. It will help people to find the app.

A bit off topic: I have not yet understood exactly how the glossary on weblate works, but perhaps we should add the term so that it is translated consistently depending on the language.

j13m126 · 2023-01-28T21:46:20Z

content/_index.de.md


+Lehne Überwachung ab - nutze deine Freiheit.


'lebe deine Freiheit' would sound better imo.

Updated on Weblate.

j13m126 · 2023-01-28T21:52:57Z

content/donate/index.de.md

-   Wir lieben, was wir tun, und wir lieben unsere Nutzer ❤️.
-3. Mit deiner Unterstützung wollen wir eine bessere, datenschutzfreundliche Version von Google Maps werden.
+1. Wir sind auf deine Spenden angewiesen, damit wir Organic Maps offen und
+   frei halten können. Und frei von Werbung.


damit wir Organic Maps offen und kostenlos halten können. (free as in free of charge, right?)

Updated on Weblate.

j13m126 · 2023-01-28T21:59:00Z

content/privacy/index.de.md


-Lehne die Überwachung ab - nimm deine Freiheit wahr.
+Lehne Überwachung ab - nutze deine Freiheit.


lebe deine Freiheit

j13m126 · 2023-01-28T22:03:20Z

content/support-us/index.de.md

+- Hilf uns, [Fehler zu beheben][beizutragen] und führe Code-Reviews durch,
+  wenn du ein Entwickler bist. Jedes behobene, noch so kleine, Problem macht
+  jemanden glücklicher.
+- [Übersetze][translations] fehlende Zeichenketten in der Benutzeroberfläche


I prefer 'Übersetze fehlende Wörter oder Sätze ...'

content/support-us/index.de.md

j13m126 · 2023-01-28T22:05:53Z

content/terms/index.de.md

+Sofern nicht durch geltendes Recht vorgeschrieben oder schriftlich
+vereinbart, wird Software, die unter dieser Lizenz vertrieben wird, auf
+einer "Ist-Zustand" BASIS, OHNE GARANTIEN ODER BEDINGUNGEN JEGLICHER ART,
+weder explizit noch impliziert, angeboten. Nähere Informationen, die genaue


j13m126 · 2023-01-28T22:12:39Z

content/_index.de.md

@@ -54,64 +61,68 @@ Organic Maps ist frei von Trackern und anderen schädlichen Dingen:
 - Kein lästiger E-Mail-Spam
 - Keine Push-Benachrichtigungen
 - Keine Crapware
- ~~Keine Pestizide~~ - Rein und organisch!
+- ~~Keine Pestizide~~ Rein und organisch!


the translation of 'pure and organic' in content/_index.de.md has been changed to 'rein und nachhaltig' (pure and sustainable), which sounds better to me. It should be changed here as well.

j13m126 · 2023-01-28T22:13:23Z

po/content.de.po

@@ -211,7 +211,7 @@ msgstr "Keine Crapware"
 #. type: Bullet: '- '
 #: content/_index.md
 msgid "~~No pesticides~~ Purely organic!"
-msgstr "~~Keine Pestizide~~ Rein biologisch!"
+msgstr "~~Keine Pestizide~~ Rein und organisch!"


the translation of 'pure and organic' in content/_index.de.md has been changed to 'rein und nachhaltig' (pure and sustainable), which sounds better to me. It should be changed here as well.

ok, please add changes directly to https://hosted.weblate.org/projects/organicmaps/website/de/

biodranik · 2023-01-28T22:22:43Z

content/_index.de.md

 extra:
  menu_title: Startseite
+page_template: index.html
+sort_by: weight
+title: 'Organic Maps: Offline Wandern, Radfahren, Wanderwege und Navigation'


It is safer to use double quotes to avoid apostrophe issues.

This YAML is generated by YAML library.

biodranik · 2023-01-28T22:23:24Z

content/_index.de.md


-## Funktionen
+{{ screenshot(src='/images/screenshots/dark.jpg', alt='Navigation im dunklen
+Modus') }}


Why is it moved to a new line? Let's increase the char limit per line.

I will take a look.

biodranik · 2023-01-28T22:24:21Z

content/_index.de.md


 ## Wer zahlt für die kostenlose App?

-Die App ist für alle kostenlos. Bitte unterstütze uns mit einer [Spende](@/donate/index.de.md)!
+Die App ist für alle kostenlos. Bitte unterstütze uns mit einer
+[Spende][donate]!


Is it the correct link to the DE version?

biodranik · 2023-01-28T22:25:45Z

content/_index.de.md

-
-### Trage zur App bei
-
-Es gibt viele Möglichkeiten beizutragen die [hier](@/support-us/index.de.md) aufgeführt sind.


Was this section and link lost?

Not lost, but was synchronized with English source. I don't see this section in English.

Unfortunately, it was lost in English.

biodranik · 2023-01-28T22:26:27Z

content/donate/index.de.md

-Ja! Es gibt viele Möglichkeiten, Organic Maps zu unterstützen. Weitere Details findest du auf der
-[Beitragen](@/support-us/index.de.md) Seite.
+Ja! Es gibt viele Möglichkeiten, Organic Maps zu unterstützen. Weitere
+Details findest du auf der [Beitragen](@/support-us/index.md) Seite.


Suggested change

Details findest du auf der [Beitragen](@/support-us/index.md) Seite.

Details findest du auf der [Beitragen](@/support-us/index.de.md) Seite.

biodranik · 2023-01-28T22:27:33Z

content/support-us/index.de.md

- Bewerte uns in [Google Play](market://details?id=app.organicmaps),
-  [Apple Store](https://itunes.apple.com/app/id1567437057?action=write-review),
-  [Huawei Appgallery](appmarket://details?id=app.organicmaps).
+- [Spenden][spenden]! Jeder Dollar oder Euro zählt und hilft uns, die Server


Is it a correctly localized link?

rtsisyk · 2023-01-29T06:59:09Z

Updated translations as suggested above and re-generated Markdowns.

nautilusx · 2023-01-29T09:42:01Z

@rtsisyk thanks for the change. We should use only one source of truth for the source code/source string which is Github and only allow translations from Weblate.

In my opinion otherwise there are only problems and it is too annoying for all (devs and translators).

I changed one string on Weblate. All other changes are fine.

This patch overwrites German Markdowns with translations from Weblate. Any further edits should be done through Weblate. Translate-URL: https://hosted.weblate.org/projects/organicmaps/website/de/ Signed-off-by: nautilusx <translate@disroot.org> Signed-off-by: Roman Tsisyk <roman@tsisyk.com>

rtsisyk · 2023-02-05T15:34:09Z

Re-based on the latest master with all recent changes from Weblate.

biodranik

I'm ok if de translation team is ok.

csidirop

I'm not that happy with some wording but thats not the point here. I will look at those in weblate. Rest seams fine, I think.

nautilusx · 2023-02-06T11:03:03Z

It's fine. @csidirop let's find the best translations on weblate.

rtsisyk requested a review from a team January 2, 2023 09:13

rtsisyk requested a review from biodranik January 2, 2023 09:13

rtsisyk force-pushed the weblate-de branch from c6e7cdc to c4fa4b9 Compare January 2, 2023 09:14

rtsisyk force-pushed the weblate-de branch from c4fa4b9 to 5866403 Compare January 28, 2023 09:53

rtsisyk commented Jan 28, 2023

View reviewed changes

content/terms/index.de.md Outdated Show resolved Hide resolved

rtsisyk force-pushed the weblate-de branch from 5866403 to 5ad75b9 Compare January 28, 2023 10:06

rtsisyk force-pushed the weblate-de branch from 5ad75b9 to 36b9230 Compare January 28, 2023 17:20

rtsisyk changed the title ~~Integrate German into Weblate~~ Switch German to Weblate Jan 28, 2023

rtsisyk requested review from nautilusx and j13m126 January 28, 2023 17:32

nautilusx approved these changes Jan 28, 2023

View reviewed changes

rtsisyk force-pushed the weblate-de branch from 36b9230 to 87eed6e Compare January 28, 2023 18:16

j13m126 reviewed Jan 28, 2023

View reviewed changes

content/support-us/index.de.md Outdated Show resolved Hide resolved

j13m126 reviewed Jan 28, 2023

View reviewed changes

biodranik requested changes Jan 28, 2023

View reviewed changes

rtsisyk force-pushed the weblate-de branch from 87eed6e to ebc7a37 Compare January 29, 2023 06:58

nautilusx requested a review from biodranik January 29, 2023 09:42

rtsisyk force-pushed the weblate-de branch from ebc7a37 to 09075d3 Compare February 5, 2023 15:33

rtsisyk requested review from j13m126, csidirop and nautilusx February 5, 2023 15:34

biodranik approved these changes Feb 5, 2023

View reviewed changes

csidirop approved these changes Feb 6, 2023

View reviewed changes

nautilusx approved these changes Feb 6, 2023

View reviewed changes

j13m126 approved these changes Feb 6, 2023

View reviewed changes

rtsisyk merged commit b25abf1 into master Feb 9, 2023

rtsisyk deleted the weblate-de branch February 9, 2023 08:01


		Organic Maps ist rein und organisch, mit Liebe gemacht:
		Organic Maps ist rein und nachhaltig, mit Liebe gemacht:


		Lehne die Überwachung ab - nimm deine Freiheit wahr.
		Lehne Überwachung ab - nutze deine Freiheit.


		### Trage zur App bei

		Es gibt viele Möglichkeiten beizutragen die [hier](@/support-us/index.de.md) aufgeführt sind.

	Details findest du auf der [Beitragen](@/support-us/index.md) Seite.
	Details findest du auf der [Beitragen](@/support-us/index.de.md) Seite.

Switch German to Weblate #91

Switch German to Weblate #91

Conversation

rtsisyk commented Jan 2, 2023 • edited Loading

cloudflare-workers-and-pages bot commented Jan 2, 2023 • edited Loading

Deploying with Cloudflare Pages

rtsisyk commented Jan 3, 2023

rtsisyk commented Jan 28, 2023

j13m126 commented Jan 28, 2023

rtsisyk commented Jan 28, 2023

nautilusx commented Jan 28, 2023 • edited Loading

rtsisyk commented Jan 28, 2023

rtsisyk commented Jan 28, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rtsisyk commented Jan 29, 2023

nautilusx commented Jan 29, 2023

rtsisyk commented Feb 5, 2023

biodranik left a comment

Choose a reason for hiding this comment

csidirop left a comment

Choose a reason for hiding this comment

nautilusx commented Feb 6, 2023

rtsisyk commented Jan 2, 2023 •

edited

Loading

cloudflare-workers-and-pages bot commented Jan 2, 2023 •

edited

Loading

nautilusx commented Jan 28, 2023 •

edited

Loading