[debian-edu-commits] [Git][debian-edu/debian-edu-doc][master] Update Japanese translation, thanks to hoxp18

[Frans Spiesschaert]

Hi Holger and Hoxp18

Holger Levsen schreef op do 13-06-2019 om 16:43 [+0000]:
> 
> 
> Holger Levsen pushed to branch master
> at Debian Edu / debian-edu-doc
> 
> 
> Commits:
> 
> 
> 
> 4262ddee
> 
> by Holger Levsen
> at 2019-06-13T16:42:36Z
> 
> 
> Update Japanese translation, thanks to hoxp18

I am afraid this will cause major problems, because Hoxp18
also made some translation updates on hosted.weblate.
Some of them even are not committed yet to the git repo
of weblate itself. 
As a consequence even the PO-Revision-Date field of debian-edu-buster-
manual.ja.po
will not give me a clue on how to solve merge conflicts.
And I am unfamiliar with the Japanese language, I must admit.

So I propose to Hoxpo to also apply the updates here under to weblate.
This makes it possible for me to take the debian-edu-buster-
manual.ja.po file
from weblate to update the debian-edu-doc git repo on salsa next
Saturday,
while ignoring the present update.



> Signed-off-by: Holger Levsen <holger at layer-acht.org>
> 
> 
> 
> 1 changed file:
> 
> 
> 
> documentation/debian-edu-buster/debian-edu-buster-manual.ja.po
> 
> 
> 
> Changes:
> 
> documentation/debian-edu-buster/debian-edu-buster-manual.ja.po
> 
> 
> 
> ...
> ...
> @@ -25,10 +25,8 @@ msgid "en"
> 
> 
> 
> 25
> 
> 
> 25
> 
> 
>  msgstr "ja"
> 
> 
> 
> 
> 
> 26
> 
> 
> 26
> 
> 
>  
> 
> 
> 
> 
> 
> 27
> 
> 
> 27
> 
> 
>  #. type: Content of: <article><articleinfo><title>
> 
> 
> 
> 
> 
> 28
> 
> 
>  
> 
> 
> -#, fuzzy
> 
> 
> 
> 
> 
> 29
> 
> 
>  
> 
> 
> -#| msgid "Debian Edu / Skolelinux Buster 10+edu0 Manual 2019-05-16"
> 
> 
> 
> 
> 
> 30
> 
> 
> 28
> 
> 
>  msgid "Debian Edu / Skolelinux Buster 10+edu0 Manual 2019-06-12"
> 
> 
> 
> 
> 
> 31
> 
> 
>  
> 
> 
> -msgstr "Debian Edu / Skolelinux Buster 10+edu0 マニュアル 2019-05-16"
> 
> 
> 
> 
> 
>  
> 
> 
> 29
> 
> 
> +msgstr "Debian Edu / Skolelinux Buster 10+edu0 マニュアル 2019-06-12"
> 
> 
> 
> 
> 
> 32
> 
> 
> 30
> 
> 
>  
> 
> 
> 
> 
> 
> 33
> 
> 
> 31
> 
> 
>  #. type: Content of: <article><section><section><title>
> 
> 
> 
> 
> 
> 34
> 
> 
> 32
> 
> 
>  msgid "Manual for Debian Edu 10+edu0 Codename Buster"
> 
> 
> 
> 
> ...
> ...
> @@ -162,16 +160,8 @@ msgstr ""
> 
> 
> 
> 162
> 
> 
> 160
> 
> 
>  "Education」もそれぞれの地域でわかりやすい語だったからです。"
> 
> 
> 
> 
> 
> 163
> 
> 
> 161
> 
> 
>  
> 
> 
> 
> 
> 
> 164
> 
> 
> 162
> 
> 
>  #. type: Content of: <article><section><section><para>
> 
> 
> 
> 
> 
> 165
> 
> 
>  
> 
> 
> -#, fuzzy
> 
> 
> 
> 
> 
> 166
> 
> 
>  
> 
> 
> -#| msgid ""
> 
> 
> 
> 
> 
> 167
> 
> 
>  
> 
> 
> -#| "The main target group in Norway initially were schools serving
> the 6-16 "
> 
> 
> 
> 
> 
> 168
> 
> 
>  
> 
> 
> -#| "years age bracket. Today the system is in use in several
> countries around "
> 
> 
> 
> 
> 
> 169
> 
> 
>  
> 
> 
> -#| "the world, with most installations in Norway, Spain, Germany and
> France."
> 
> 
> 
> 
> 
> 170
> 
> 
> 163
> 
> 
>  msgid "Today the system is in use in several countries around the
> world."
> 
> 
> 
> 
> 
> 171
> 
> 
>  
> 
> 
> -msgstr ""
> 
> 
> 
> 
> 
> 172
> 
> 
>  
> 
> 
> -"ノルウェーで最初に主な対象とした団体は 6〜16 歳の年齢層を扱う学校でした。現在"
> 
> 
> 
> 
> 
> 173
> 
> 
>  
> 
> 
> -"このシステムは世界各国で利用されていますが、導入されているほとんどはノル"
> 
> 
> 
> 
> 
> 174
> 
> 
>  
> 
> 
> -"ウェー、スペイン、ドイツ、そしてフランスです。"
> 
> 
> 
> 
> 
>  
> 
> 
> 164
> 
> 
> +msgstr "今や世界的に広まり、複数の国でこのシステムは利用されています。"
> 
> 
> 
> 
> 
> 175
> 
> 
> 165
> 
> 
>  
> 
> 
> 
> 
> 
> 176
> 
> 
> 166
> 
> 
>  #. type: Content of: <article><section><title>
> 
> 
> 
> 
> 
> 177
> 
> 
> 167
> 
> 
>  msgid "Architecture"
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> 
> —
> 
> 
> View it on GitLab.
> 
> 
> You're receiving this email because of your account on
> salsa.debian.org.
> If you'd like to receive fewer emails, you can
> adjust your notification settings.
> {"@context":"http://schema.org","@type":"EmailMessage","action":{"@ty
> pe":"ViewAction","name":"View
> Commit","url":"https://salsa.debian.org/debian-edu/debian-edu-
> doc/commit/4262ddee7f5276e3a6346d43862a83c04ccec7cf"}}
> 
> 
> 
> 
> 
> 
> _______________________________________________
> debian-edu-commits mailing list
> debian-edu-commits at alioth-lists.debian.net
> https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-edu-c
> ommits


-- 
Met vriendelijke groet,
Frans Spiesschaert

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20190613/7a4dcd1f/attachment-0001.html>