From e25b0ed2d2c27f32744f6810b97268aa933251eb Mon Sep 17 00:00:00 2001 From: upstream svn Date: Sat, 27 Feb 2021 18:31:40 +0000 Subject: [PATCH] Add missing Romanian translation and various spelling fixes in debian --- .svn-revision | 2 +- debian/amule-alc.manpages | 1 + debian/amule-alcc.manpages | 1 + debian/amule-cas.manpages | 1 + debian/amule-cmd.manpages | 1 + debian/amule-daemon.manpages | 1 + debian/amule-ed2k.manpages | 1 + debian/amule-i18n-ro.dirs | 2 ++ debian/amule-i18n-ro.install | 1 + debian/amule-remote-gui.manpages | 1 + debian/amule-wxcas.manpages | 1 + debian/amule-xas.manpages | 1 + debian/amule.manpages | 1 + debian/amuleweb.manpages | 1 + debian/changelog | 8 +++++++ debian/clean | 1 + debian/control | 46 +++++++++++++++++++++++----------------- debian/rules | 4 ++++ po/CMakeLists.txt | 1 + 19 files changed, 56 insertions(+), 20 deletions(-) create mode 100644 debian/amule-i18n-ro.dirs create mode 100644 debian/amule-i18n-ro.install diff --git a/.svn-revision b/.svn-revision index f3805737..56b2d8a4 100644 --- a/.svn-revision +++ b/.svn-revision @@ -1 +1 @@ -11119 +11120 diff --git a/debian/amule-alc.manpages b/debian/amule-alc.manpages index 2115f5f0..41c19518 100644 --- a/debian/amule-alc.manpages +++ b/debian/amule-alc.manpages @@ -4,6 +4,7 @@ src/utils/aLinkCreator/docs/alc.es.1 src/utils/aLinkCreator/docs/alc.fr.1 src/utils/aLinkCreator/docs/alc.hu.1 src/utils/aLinkCreator/docs/alc.it.1 +src/utils/aLinkCreator/docs/alc.ro.1 src/utils/aLinkCreator/docs/alc.ru.1 src/utils/aLinkCreator/docs/alc.tr.1 src/utils/aLinkCreator/docs/alc.zh_TW.1 diff --git a/debian/amule-alcc.manpages b/debian/amule-alcc.manpages index 19dc81cb..ead3d274 100644 --- a/debian/amule-alcc.manpages +++ b/debian/amule-alcc.manpages @@ -4,6 +4,7 @@ src/utils/aLinkCreator/docs/alcc.es.1 src/utils/aLinkCreator/docs/alcc.fr.1 src/utils/aLinkCreator/docs/alcc.hu.1 src/utils/aLinkCreator/docs/alcc.it.1 +src/utils/aLinkCreator/docs/alcc.ro.1 src/utils/aLinkCreator/docs/alcc.ru.1 src/utils/aLinkCreator/docs/alcc.tr.1 src/utils/aLinkCreator/docs/alcc.zh_TW.1 diff --git a/debian/amule-cas.manpages b/debian/amule-cas.manpages index 2fe262bd..9606a79a 100644 --- a/debian/amule-cas.manpages +++ b/debian/amule-cas.manpages @@ -4,6 +4,7 @@ src/utils/cas/docs/cas.es.1 src/utils/cas/docs/cas.fr.1 src/utils/cas/docs/cas.hu.1 src/utils/cas/docs/cas.it.1 +src/utils/cas/docs/cas.ro.1 src/utils/cas/docs/cas.ru.1 src/utils/cas/docs/cas.tr.1 src/utils/cas/docs/cas.zh_TW.1 diff --git a/debian/amule-cmd.manpages b/debian/amule-cmd.manpages index ffcfc235..34384e80 100644 --- a/debian/amule-cmd.manpages +++ b/debian/amule-cmd.manpages @@ -4,6 +4,7 @@ docs/man/amulecmd.es.1 docs/man/amulecmd.fr.1 docs/man/amulecmd.hu.1 docs/man/amulecmd.it.1 +docs/man/amulecmd.ro.1 docs/man/amulecmd.ru.1 docs/man/amulecmd.tr.1 docs/man/amulecmd.zh_TW.1 diff --git a/debian/amule-daemon.manpages b/debian/amule-daemon.manpages index de6c661b..c9765c36 100644 --- a/debian/amule-daemon.manpages +++ b/debian/amule-daemon.manpages @@ -4,6 +4,7 @@ docs/man/amuled.es.1 docs/man/amuled.fr.1 docs/man/amuled.hu.1 docs/man/amuled.it.1 +docs/man/amuled.ro.1 docs/man/amuled.ru.1 docs/man/amuled.tr.1 docs/man/amuled.zh_TW.1 diff --git a/debian/amule-ed2k.manpages b/debian/amule-ed2k.manpages index fdc12f05..05e103de 100644 --- a/debian/amule-ed2k.manpages +++ b/debian/amule-ed2k.manpages @@ -4,6 +4,7 @@ docs/man/ed2k.es.1 docs/man/ed2k.fr.1 docs/man/ed2k.hu.1 docs/man/ed2k.it.1 +docs/man/ed2k.ro.1 docs/man/ed2k.ru.1 docs/man/ed2k.tr.1 docs/man/ed2k.zh_TW.1 diff --git a/debian/amule-i18n-ro.dirs b/debian/amule-i18n-ro.dirs new file mode 100644 index 00000000..baa8fff3 --- /dev/null +++ b/debian/amule-i18n-ro.dirs @@ -0,0 +1,2 @@ +usr/share/doc/amule-i18n-ro +usr/share/locale/ro/LC_MESSAGES diff --git a/debian/amule-i18n-ro.install b/debian/amule-i18n-ro.install new file mode 100644 index 00000000..2eb1c5f0 --- /dev/null +++ b/debian/amule-i18n-ro.install @@ -0,0 +1 @@ +debian/tmp/usr/share/locale/ro diff --git a/debian/amule-remote-gui.manpages b/debian/amule-remote-gui.manpages index 8ad4747b..ea74f008 100644 --- a/debian/amule-remote-gui.manpages +++ b/debian/amule-remote-gui.manpages @@ -4,6 +4,7 @@ docs/man/amulegui.es.1 docs/man/amulegui.fr.1 docs/man/amulegui.hu.1 docs/man/amulegui.it.1 +docs/man/amulegui.ro.1 docs/man/amulegui.ru.1 docs/man/amulegui.tr.1 docs/man/amulegui.zh_TW.1 diff --git a/debian/amule-wxcas.manpages b/debian/amule-wxcas.manpages index 120057a0..a4e630ed 100644 --- a/debian/amule-wxcas.manpages +++ b/debian/amule-wxcas.manpages @@ -4,6 +4,7 @@ src/utils/wxCas/docs/wxcas.es.1 src/utils/wxCas/docs/wxcas.fr.1 src/utils/wxCas/docs/wxcas.hu.1 src/utils/wxCas/docs/wxcas.it.1 +src/utils/wxCas/docs/wxcas.ro.1 src/utils/wxCas/docs/wxcas.ru.1 src/utils/wxCas/docs/wxcas.tr.1 src/utils/wxCas/docs/wxcas.zh_TW.1 diff --git a/debian/amule-xas.manpages b/debian/amule-xas.manpages index 91e28a7f..62d7ee75 100644 --- a/debian/amule-xas.manpages +++ b/debian/amule-xas.manpages @@ -4,6 +4,7 @@ src/utils/xas/docs/xas.es.1 src/utils/xas/docs/xas.fr.1 src/utils/xas/docs/xas.hu.1 src/utils/xas/docs/xas.it.1 +src/utils/xas/docs/xas.ro.1 src/utils/xas/docs/xas.ru.1 src/utils/xas/docs/xas.tr.1 src/utils/xas/docs/xas.zh_TW.1 diff --git a/debian/amule.manpages b/debian/amule.manpages index 684a4f9b..85af4ed9 100644 --- a/debian/amule.manpages +++ b/debian/amule.manpages @@ -4,6 +4,7 @@ docs/man/amule.es.1 docs/man/amule.fr.1 docs/man/amule.hu.1 docs/man/amule.it.1 +docs/man/amule.ro.1 docs/man/amule.ru.1 docs/man/amule.tr.1 docs/man/amule.zh_TW.1 diff --git a/debian/amuleweb.manpages b/debian/amuleweb.manpages index d7eb1003..51748554 100644 --- a/debian/amuleweb.manpages +++ b/debian/amuleweb.manpages @@ -4,6 +4,7 @@ docs/man/amuleweb.es.1 docs/man/amuleweb.fr.1 docs/man/amuleweb.hu.1 docs/man/amuleweb.it.1 +docs/man/amuleweb.ro.1 docs/man/amuleweb.ru.1 docs/man/amuleweb.tr.1 docs/man/amuleweb.zh_TW.1 diff --git a/debian/changelog b/debian/changelog index 5992f946..278cb120 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +amule (2.3.3+git-20210227) stable; urgency=low + + * git-rev: d442b256 + 1 + * add Romanian translation + * spelling fixes + + -- Dévai Tamás (gonosztopi) Sat, 27 Feb 2021 19:17:59 +0100 + amule (2.3.2+git-20210127) stable; urgency=low * git-rev: 0e9e3efc + 1 diff --git a/debian/clean b/debian/clean index 7281b534..4a10be46 100644 --- a/debian/clean +++ b/debian/clean @@ -59,6 +59,7 @@ i18n-nn i18n-pl i18n-pt-br i18n-pt-pt +i18n-ro i18n-ru i18n-sl i18n-sv diff --git a/debian/control b/debian/control index c265b112..74be7859 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Depends: ${shlibs:Depends}, amule-common (= ${binary:Version}), amule-i18n-en-gb Recommends: amule-utils, amule-cas, amule-wxcas Suggests: amule-xas, amule-ed2k Description: client for eD2k and Kad networks - aMule stands for another eMule file-sharing program, it is also + aMule stands for all-platform eMule file-sharing program, it is also another fork of the xMule project. It connects to eDonkey2000 network, supports Linux, *BSD and MacOS X platforms, and has a new vision of the GUI @@ -24,9 +24,9 @@ Recommends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) Description: utilities for amule amule-utils is a meta-package for a set of tools to control amule. . - alcc lets you created ed2k-links and hashes from the commandline - cas is a remplacement software for astats. It produces statistic from amule. - amulecmd is a software which helps you to control amule trough a terminal. + alcc lets you create ed2k-links and hashes from the commandline. + cas is a replacement software for astats. It produces statistic from amule. + amulecmd is a software which helps you to control amule through a terminal. Package: amule-utils-gui Architecture: any @@ -38,8 +38,7 @@ Description: utilities for amule This is a meta-package that depends on useful programs using GUI to control aMule. . - alc is a software to created ed2k-links and hashes - amule trough a terminal. + alc is a software to create ed2k-links and hashes amulegui lets you control amule or amuled from a remote machine wxcas shows you statistics about your amule usage @@ -50,7 +49,7 @@ Recommends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version}), xmule (<= 1.10.0b-1), amule-utils (<< ${binary:Version}) Replaces: amule-utils (<< ${binary:Version}) Description: amule ed2k link-handler - ed2k let you use ed2k Links with your amule-app + ed2k lets you use ed2k Links with your amule-app Package: amule-cas Architecture: any @@ -87,7 +86,7 @@ Provides: amule-web-templates Depends: amuleweb (= ${binary:Version}), ${misc:Depends} Conflicts: amule-common (<< ${binary:Version}), amule (<< ${binary:Version}) Description: default template for the webserver - this package contains the default template for amulewebserver + this package contains the default template for amule webserver atm the litoral theme is the default one, and the only one included in aMule @@ -277,8 +276,8 @@ Architecture: any Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version}), ${misc:Depends} Provides: amule-i18n Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version}) -Description: Gallegan (gl) internationalized (i18n) files for amule - This package contains the Gallegan internationalized files for amule. +Description: Galician (gl) internationalized (i18n) files for amule + This package contains the Galician internationalized files for amule. Package: amule-i18n-he Section: localization @@ -314,7 +313,7 @@ Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amul Provides: amule-i18n Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version}) Description: Italian (it_CH) internationalized (i18n) files for amule - This package contains the Italian internationalized files for amule. + This package contains the Italian (Swiss) internationalized files for amule. Package: amule-i18n-it Section: localization @@ -349,8 +348,8 @@ Architecture: any Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version}), ${misc:Depends} Provides: amule-i18n Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version}) -Description: Lithunian (lt) internationalized (i18n) files for amule - This package contains the Lithunian internationalized files for amule. +Description: Lithuanian (lt) internationalized (i18n) files for amule + This package contains the Lithuanian internationalized files for amule. Package: amule-i18n-nn Section: localization @@ -358,8 +357,8 @@ Architecture: any Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version}), ${misc:Depends} Provides: amule-i18n Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version}) -Description: Norwegian (Nyorsk) (nn) internationalized (i18n) files for amule - This package contains the Norwegian (Nyorsk) internationalized files for amule. +Description: Norwegian (Nynorsk) (nn) internationalized (i18n) files for amule + This package contains the Norwegian (Nynorsk) internationalized files for amule. Package: amule-i18n-nl Section: localization @@ -386,7 +385,7 @@ Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amul Provides: amule-i18n Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version}) Description: Portuguese (pt_BR) internationalized (i18n) files for amule - This package contains the Portuguese internationalized files for amule. + This package contains the Portuguese (Brazilian) internationalized files for amule. Package: amule-i18n-pt-pt Section: localization @@ -397,6 +396,15 @@ Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version}) Description: Portuguese (pt_PT) internationalized (i18n) files for amule This package contains the Portuguese internationalized files for amule. +Package: amule-i18n-ro +Section: localization +Architecture: any +Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version}), ${misc:Depends} +Provides: amule-i18n +Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version}) +Description: Romanian (ro) internationalized (i18n) files for amule + This package contains the Romanian internationalized files for amule. + Package: amule-i18n-ru Section: localization Architecture: any @@ -449,7 +457,7 @@ Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amul Provides: amule-i18n Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version}) Description: Ukrainian (uk) internationalized (i18n) files for amule - This package contains the Catalan internationalized files for amule. + This package contains the Ukrainian internationalized files for amule. Package: amule-i18n-zh-cn Section: localization @@ -458,7 +466,7 @@ Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amul Provides: amule-i18n Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version}) Description: Chinese (zh_CN) internationalized (i18n) files for amule - This package contains the Chinese internationalized files for amule. + This package contains the Chinese (Simplified) internationalized files for amule. Package: amule-i18n-zh-tw Section: localization @@ -467,7 +475,7 @@ Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amul Provides: amule-i18n Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version}) Description: Chinese (zh_TW) internationalized (i18n) files for amule - This package contains the Chinese internationalized files for amule. + This package contains the Chinese (Traditional) internationalized files for amule. #Package: amule-plasmamule #Architecture: any diff --git a/debian/rules b/debian/rules index b663a643..5eb49bbb 100755 --- a/debian/rules +++ b/debian/rules @@ -239,6 +239,10 @@ else LANGUAGE := $(LANGUAGE),pt_PT endif + ifeq ("i18n-ro", "$(findstring i18n-ro, $(flags))") + LANGUAGE := $(LANGUAGE),ro + endif + ifeq ("i18n-ru", "$(findstring i18n-ru, $(flags))") LANGUAGE := $(LANGUAGE),ru endif diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt index 950855b0..136f5b8b 100644 --- a/po/CMakeLists.txt +++ b/po/CMakeLists.txt @@ -32,6 +32,7 @@ FUNCTION (SetTranslationOption PoName DefaultMode) STRING (REGEX REPLACE "^pl$" "Polish" LangName "${LangName}") STRING (REGEX REPLACE "^pt_BR$" "Portuguese (Brazilian)" LangName "${LangName}") STRING (REGEX REPLACE "^pt_PT$" "Portuguese" LangName "${LangName}") + STRING (REGEX REPLACE "^ro$" "Romanian" LangName "${LangName}") STRING (REGEX REPLACE "^ru$" "Russian" LangName "${LangName}") STRING (REGEX REPLACE "^sl$" "Slovenian" LangName "${LangName}") STRING (REGEX REPLACE "^sq$" "Albanian" LangName "${LangName}") -- 2.11.4.GIT