[debian-edu-commits] [Git][debian-edu/debian-edu-doc][master] 2 commits: trivially unfuzz translations
Holger Levsen
gitlab at salsa.debian.org
Fri Feb 28 15:39:51 GMT 2020
Holger Levsen pushed to branch master at Debian Edu / debian-edu-doc
Commits:
84f99a70 by Holger Levsen at 2020-02-28T16:39:01+01:00
trivially unfuzz translations
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
6f6deed4 by Holger Levsen at 2020-02-28T16:39:40+01:00
Update debian/copyright from the wikis.
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
9 changed files:
- debian/changelog
- debian/copyright
- documentation/audacity/audacity-manual.ja.po
- documentation/audacity/audacity-manual.nb.po
- documentation/audacity/audacity-manual.nl.po
- documentation/audacity/audacity-manual.pt_BR.po
- documentation/debian-edu-bullseye/debian-edu-bullseye-manual.de.po
- documentation/rosegarden/rosegarden-manual.nb.po
- documentation/rosegarden/rosegarden-manual.nl.po
Changes:
=====================================
debian/changelog
=====================================
@@ -3,6 +3,7 @@ debian-edu-doc (2.11.4) UNRELEASED; urgency=medium
* Update Debian Edu Bullseye manual from the wiki.
* Update Audacity manual from the wiki.
* Update Rosegarden manual from the wiki.
+ * Update debian/copyright from the wikis.
[ Translation updates ]
* Audacity manual:
=====================================
debian/copyright
=====================================
@@ -67,7 +67,7 @@ License: GPL-2+
Files: documentation/audacity/audacity-manual.nb.po
Copyright: 2014 Jon Nordby
2014, 2018 Petter Reinholdtsen
- 2018, 2019 Allan Nordhøy
+ 2018, 2019, 2020 Allan Nordhøy
License: GPL-2+
Files: documentation/audacity/audacity-manual.fr.po
@@ -92,7 +92,7 @@ License: GPL-2+
Files: documentation/audacity/audacity-manual.zh.po
Copyright: 2017 Zhang Miao
- 2018 Ma Yong
+ 2018, 2020 Ma Yong
2019 zlffcn
License: GPL-2+
@@ -178,7 +178,7 @@ Copyright: 2007, 2012, 2014, 2015, 2016, 2017, 2018, 2019 Petter Reinholdtsen
2014 FourFire Le'bard
2014 Stefan Mitchell-Lauridsen
2014 Ragnar Wisløff
- 2018-2019 Allan Nordhøy
+ 2018-2020 Allan Nordhøy
License: GPL-2+
Files: documentation/debian-edu-bullseye/debian-edu-bullseye-manual.de.po
@@ -428,7 +428,7 @@ License: GPL-2+
Files: documentation/rosegarden/rosegarden-manual.zh.po
Copyright: 2018 杨玉印
- 2019 Ma Yong
+ 2019, 2020 Ma Yong
License: GPL-2+
Files: documentation/rosegarden/rosegarden-manual.zh_Hant.po
=====================================
documentation/audacity/audacity-manual.ja.po
=====================================
@@ -457,18 +457,13 @@ msgid "Translation copyright and authors"
msgstr "翻訳の著作権と著者"
#. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid ""
-#| "The Bokmål translation is copyrighted by Jon Nordby (2014), Petter "
-#| "Reinholdtsen (2014, 2018) and Allan Nordhøy (2018, 2019) and is released "
-#| "under the GPL v2 or any later version."
msgid ""
"The Bokmål translation is copyrighted by Jon Nordby (2014), Petter "
"Reinholdtsen (2014, 2018) and Allan Nordhøy (2018, 2019, 2020) and is "
"released under the GPL v2 or any later version."
msgstr ""
"ノルウェー語 (ブークモール) 翻訳版は、Jon Nordby (2014)、Petter Reinholdtsen "
-"(2014, 2018)、Allan Nordhøy (2018, 2019) に著作権があり GPL v2 以降のライセン"
+"(2014, 2018)、Allan Nordhøy (2018, 2019, 2020) に著作権があり GPL v2 以降のライセン"
"スで提供されています。"
#. type: Content of: <article><section><para>
@@ -501,17 +496,12 @@ msgstr ""
"Münster (2019) に著作権があり、GPL v2 以降のライセンスで提供されています。"
#. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid ""
-#| "The Simplified Chinese translation is copyrighted by Zhang Miao (2017), "
-#| "Ma Yong (2018) and zlffcn (2019) and is released under the GPL v2 or any "
-#| "later version."
msgid ""
"The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma "
"Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 or any "
"later version."
msgstr ""
-"中国語(簡易体)翻訳版は、Zhang Miao (2017)、Ma Yong (2018)、zlffcn (2019) に著"
+"中国語(簡易体)翻訳版は、Zhang Miao (2017)、Ma Yong (2018, 2020)、zlffcn (2019) に著"
"作権があり、GPL v2 以降のライセンスで提供されています。"
#. type: Content of: <article><section><para>
=====================================
documentation/audacity/audacity-manual.nb.po
=====================================
@@ -491,18 +491,13 @@ msgid "Translation copyright and authors"
msgstr "Opphavsrett og forfattere av oversettelser"
#. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid ""
-#| "The Bokmål translation is copyrighted by Jon Nordby (2014), Petter "
-#| "Reinholdtsen (2014, 2018) and Allan Nordhøy (2018, 2019) and is released "
-#| "under the GPL v2 or any later version."
msgid ""
"The Bokmål translation is copyrighted by Jon Nordby (2014), Petter "
"Reinholdtsen (2014, 2018) and Allan Nordhøy (2018, 2019, 2020) and is "
"released under the GPL v2 or any later version."
msgstr ""
"Rettighetene for oversettelsen til norsk bokmål tilhører Jon Nordby (2014), "
-"Petter Reinholdtsen (2014, 2018) og Allan Nordhøy (2018, 2019), og er utgitt "
+"Petter Reinholdtsen (2014, 2018) og Allan Nordhøy (2018, 2019, 2020), og er utgitt "
"under GPL v2 eller en senere versjon."
#. type: Content of: <article><section><para>
@@ -539,18 +534,13 @@ msgstr ""
"GPL v2 eller enhver senere versjon."
#. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid ""
-#| "The Simplified Chinese translation is copyrighted by Zhang Miao (2017), "
-#| "Ma Yong (2018) and zlffcn (2019) and is released under the GPL v2 or any "
-#| "later version."
msgid ""
"The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma "
"Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 or any "
"later version."
msgstr ""
"Rettigheten til oversettelsen til forenklet kinesisk tilhører Zhang Miao "
-"(2017), Ma Yong (2018) og zlffcn (2019), utgitt med lisensen GPL v2 eller "
+"(2017), Ma Yong (2018, 2020) og zlffcn (2019), utgitt med lisensen GPL v2 eller "
"enhver senere versjon."
#. type: Content of: <article><section><para>
=====================================
documentation/audacity/audacity-manual.nl.po
=====================================
@@ -498,11 +498,6 @@ msgid "Translation copyright and authors"
msgstr "Auteursrechten en auteurs van vertalingen"
#. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid ""
-#| "The Bokmål translation is copyrighted by Jon Nordby (2014), Petter "
-#| "Reinholdtsen (2014, 2018) and Allan Nordhøy (2018, 2019) and is released "
-#| "under the GPL v2 or any later version."
msgid ""
"The Bokmål translation is copyrighted by Jon Nordby (2014), Petter "
"Reinholdtsen (2014, 2018) and Allan Nordhøy (2018, 2019, 2020) and is "
@@ -510,7 +505,7 @@ msgid ""
msgstr ""
"De auteursrechten van de vertaling naar het Noorse Bokmål berusten bij Jon "
"Nordby (2014), Petter Reinholdtsen (2014, 2018) en Allan Nordhøy (2018, "
-"2019). Het document werd uitgegeven onder de licentie GPL v2 of een latere "
+"2019, 2020). Het document werd uitgegeven onder de licentie GPL v2 of een latere "
"versie."
#. type: Content of: <article><section><para>
@@ -546,18 +541,13 @@ msgstr ""
"uitgebracht onder de GPL-licentie versie 2 of een latere versie."
#. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid ""
-#| "The Simplified Chinese translation is copyrighted by Zhang Miao (2017), "
-#| "Ma Yong (2018) and zlffcn (2019) and is released under the GPL v2 or any "
-#| "later version."
msgid ""
"The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma "
"Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 or any "
"later version."
msgstr ""
"De auteursrechten van de vertaling naar het Vereenvoudigd Chinees berusten "
-"bij Zhang Miao (2017), Ma Yong (2018) en zlffcn (2019). De vertaling is "
+"bij Zhang Miao (2017), Ma Yong (2018, 2020) en zlffcn (2019). De vertaling is "
"uitgebracht onder de GPL-licentie versie 2 of een latere versie."
#. type: Content of: <article><section><para>
=====================================
documentation/audacity/audacity-manual.pt_BR.po
=====================================
@@ -494,18 +494,13 @@ msgid "Translation copyright and authors"
msgstr "Direitos autorais de tradução e autores"
#. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid ""
-#| "The Bokmål translation is copyrighted by Jon Nordby (2014), Petter "
-#| "Reinholdtsen (2014, 2018) and Allan Nordhøy (2018, 2019) and is released "
-#| "under the GPL v2 or any later version."
msgid ""
"The Bokmål translation is copyrighted by Jon Nordby (2014), Petter "
"Reinholdtsen (2014, 2018) and Allan Nordhøy (2018, 2019, 2020) and is "
"released under the GPL v2 or any later version."
msgstr ""
"O direito autoral da tradução para Bokmål é de Jon Nordby (2014), Petter "
-"Reinholdtsen (2014, 2018) e Allan Nordhøy (2018, 2019) e é lançada sob a GPL "
+"Reinholdtsen (2014, 2018) e Allan Nordhøy (2018, 2019, 2020) e é lançada sob a GPL "
"v2 ou qualquer outra versão posterior."
#. type: Content of: <article><section><para>
@@ -540,18 +535,13 @@ msgstr ""
"versão posterior."
#. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid ""
-#| "The Simplified Chinese translation is copyrighted by Zhang Miao (2017), "
-#| "Ma Yong (2018) and zlffcn (2019) and is released under the GPL v2 or any "
-#| "later version."
msgid ""
"The Simplified Chinese translation is copyrighted by Zhang Miao (2017), Ma "
"Yong (2018, 2020) and zlffcn (2019) and is released under the GPL v2 or any "
"later version."
msgstr ""
"O direito autoral para a tradução para o chinês simplificado é de Zhang Miao "
-"(2017), Ma Yong (2018) e zlffcn (2019) e é lançada sob a GPL v2 ou qualquer "
+"(2017), Ma Yong (2018, 2020) e zlffcn (2019) e é lançada sob a GPL v2 ou qualquer "
"outra versão posterior."
#. type: Content of: <article><section><para>
=====================================
documentation/debian-edu-bullseye/debian-edu-bullseye-manual.de.po
=====================================
@@ -8258,15 +8258,6 @@ msgstr ""
"lizenziert."
#. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid ""
-#| "The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
-#| "2014, 2015, 2016, 2017, 2018, 2019), Håvard Korsvoll (2007-2009), Tore "
-#| "Skogly (2008), Ole-Anders Andreassen (2010), Jan Roar Rød (2010), Ole-"
-#| "Erik Yrvin (2014, 2016, 2017), Ingrid Yrvin (2014, 2015, 2016, 2017), "
-#| "Hans Arthur Kielland Aanesen (2014), Knut Yrvin (2014), FourFire Le'bard "
-#| "(2014), Stefan Mitchell-Lauridsen (2014), Ragnar Wisløff (2014) and Allan "
-#| "Nordhøy (2018-2019) and is released under the GPL v2 or any later version."
msgid ""
"The Bokmål translation is copyrighted by Petter Reinholdtsen (2007, 2012, "
"2014, 2015, 2016, 2017, 2018, 2019), Håvard Korsvoll (2007-2009), Tore "
@@ -8282,7 +8273,7 @@ msgstr ""
"Roar Rød (2010), Ole-Erik Yrvin (2014, 2016, 2017), Ingrid Yrvin (2014, "
"2015, 2016, 2017), Hans Arthur Kielland Aanesen (2014), Knut Yrvin (2014), "
"FourFire Le'bard (2014), Stefan Mitchell-Lauridsen (2014), Ragnar Wisløff "
-"(2014) und Allan Nordhøy (2018, 2019). Sie ist unter der GPL v2 oder einer "
+"(2014) und Allan Nordhøy (2018-2020). Sie ist unter der GPL v2 oder einer "
"späteren Version lizenziert."
#. type: Content of: <article><section><para>
=====================================
documentation/rosegarden/rosegarden-manual.nb.po
=====================================
@@ -3380,16 +3380,12 @@ msgstr ""
"versjon."
#. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid ""
-#| "The Simplified Chinese translation is copyrighted by 杨玉印 (2018) and Ma "
-#| "Yong (2019) and is released under the GPL v2 or any later version."
msgid ""
"The Simplified Chinese translation is copyrighted by 杨玉印 (2018) and Ma "
"Yong (2019, 2020) and is released under the GPL v2 or any later version."
msgstr ""
"Oversettelsen til kinesisk (forenklet kinesisk) er gjort av 杨玉印 (2018) og "
-"Ma Yong (2019). Den er utgitt under GPL v2 eller senere versjon av lisensen."
+"Ma Yong (2019, 2020). Den er utgitt under GPL v2 eller senere versjon av lisensen."
#. type: Content of: <article><section><para>
msgid ""
=====================================
documentation/rosegarden/rosegarden-manual.nl.po
=====================================
@@ -3422,16 +3422,12 @@ msgstr ""
"latere versie."
#. type: Content of: <article><section><para>
-#, fuzzy
-#| msgid ""
-#| "The Simplified Chinese translation is copyrighted by 杨玉印 (2018) and Ma "
-#| "Yong (2019) and is released under the GPL v2 or any later version."
msgid ""
"The Simplified Chinese translation is copyrighted by 杨玉印 (2018) and Ma "
"Yong (2019, 2020) and is released under the GPL v2 or any later version."
msgstr ""
"De auteurs, bij wie ook de auteursrechten berusten, van de vertaling naar "
-"het vereenvoudigd Chinees zij 杨玉印 (2018) en Ma Yong (2019). De vertaling "
+"het vereenvoudigd Chinees zij 杨玉印 (2018) en Ma Yong (2019, 2020). De vertaling "
"is uitgebracht onder de GPL-licentie versie 2 of een latere versie."
#. type: Content of: <article><section><para>
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/d173d18f2c35c63765728bb31b95c543e59819b7...6f6deed405717d5f103aeae0e97c6293b40a9aa8
--
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/d173d18f2c35c63765728bb31b95c543e59819b7...6f6deed405717d5f103aeae0e97c6293b40a9aa8
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20200228/e9cb00fa/attachment-0001.html>
More information about the debian-edu-commits
mailing list