Merge ~lamoura/ubuntu/+source/update-notifier:pro-bionic-release into ubuntu/+source/update-notifier:ubuntu/devel
- Git
- lp:~lamoura/ubuntu/+source/update-notifier
- pro-bionic-release
- Merge into ubuntu/devel
Status: | Superseded |
---|---|
Proposed branch: | ~lamoura/ubuntu/+source/update-notifier:pro-bionic-release |
Merge into: | ubuntu/+source/update-notifier:ubuntu/devel |
Diff against target: |
29251 lines (+12561/-0) (has conflicts) 173 files modified
.bzr-builddeb/default.conf (+5/-0) .bzrignore (+31/-0) autogen.sh (+17/-0) config.h.in (+3/-0) configure.ac (+11/-0) data/Makefile.am (+11/-0) data/apt_check.py (+46/-0) data/backend_helper.py (+6/-0) data/com.ubuntu.update-notifier.gschema.xml.in (+4/-0) data/notify-reboot-required (+3/-0) data/package-data-downloader (+6/-0) data/update-motd-fsck-at-reboot (+7/-0) data/update-motd-hwe-eol (+14/-0) data/update-motd-updates-available (+3/-0) debian/90-updates-available (+3/-0) debian/95-hwe-eol (+3/-0) debian/changelog (+128/-0) debian/compat (+4/-0) debian/control (+28/-0) debian/rules (+7/-0) debian/systemd/unicast-local-avahi.override (+1/-0) debian/systemd/unicast-local-avahi.path (+6/-0) debian/systemd/unicast-local-avahi.service (+6/-0) debian/systemd/update-notifier-crash.path (+3/-0) debian/systemd/update-notifier-crash.service (+6/-0) debian/tests/control (+4/-0) debian/unicast-local-avahi.conf (+14/-0) debian/update-notifier-common.cron.daily (+8/-0) debian/update-notifier-common.cron.weekly (+15/-0) debian/update-notifier-common.install (+6/-0) debian/update-notifier-common.postinst (+7/-0) debian/update-notifier-common.postrm (+8/-0) debian/update-notifier-common.preinst (+8/-0) debian/update-notifier-common.triggers (+4/-0) debian/update-notifier-crash (+3/-0) debian/update-notifier.install (+21/-0) debian/update-notifier.links (+4/-0) pixmaps/scalable/livepatch-on.svg (+1/-0) pixmaps/scalable/livepatch-warning.svg (+1/-0) po/POTFILES.in (+10/-0) po/ace.po (+93/-0) po/af.po (+103/-0) po/am.po (+97/-0) po/an.po (+100/-0) po/ar.po (+106/-0) po/ast.po (+102/-0) po/az.po (+96/-0) po/be.po (+103/-0) po/bem.po (+93/-0) po/bg.po (+102/-0) po/bn.po (+102/-0) po/bo.po (+93/-0) po/br.po (+102/-0) po/bs.po (+103/-0) po/ca.po (+103/-0) po/ca@valencia.po (+103/-0) po/ckb.po (+96/-0) po/crh.po (+103/-0) po/cs.po (+103/-0) po/csb.po (+104/-0) po/cv.po (+93/-0) po/cy.po (+105/-0) po/da.po (+103/-0) po/de.po (+103/-0) po/de_DE.po (+93/-0) po/dv.po (+93/-0) po/el.po (+102/-0) po/en.po (+93/-0) po/en_AU.po (+103/-0) po/en_CA.po (+103/-0) po/en_GB.po (+103/-0) po/eo.po (+102/-0) po/es.po (+102/-0) po/et.po (+102/-0) po/eu.po (+103/-0) po/fa.po (+101/-0) po/fa_AF.po (+93/-0) po/fi.po (+103/-0) po/fil.po (+97/-0) po/fo.po (+102/-0) po/fr.po (+103/-0) po/fr_CA.po (+93/-0) po/fur.po (+98/-0) po/fy.po (+102/-0) po/ga.po (+98/-0) po/gd.po (+105/-0) po/gl.po (+103/-0) po/gu.po (+97/-0) po/he.po (+102/-0) po/hi.po (+102/-0) po/hr.po (+104/-0) po/hu.po (+103/-0) po/hy.po (+93/-0) po/id.po (+102/-0) po/is.po (+102/-0) po/it.po (+103/-0) po/ja.po (+101/-0) po/jv.po (+93/-0) po/ka.po (+101/-0) po/kk.po (+101/-0) po/km.po (+101/-0) po/kn.po (+93/-0) po/ko.po (+101/-0) po/ku.po (+100/-0) po/ky.po (+93/-0) po/lo.po (+93/-0) po/lt.po (+103/-0) po/lv.po (+103/-0) po/mhr.po (+93/-0) po/mi.po (+93/-0) po/mk.po (+99/-0) po/ml.po (+97/-0) po/mn.po (+102/-0) po/mr.po (+97/-0) po/ms.po (+103/-0) po/mt.po (+93/-0) po/my.po (+96/-0) po/nb.po (+103/-0) po/nds.po (+102/-0) po/ne.po (+97/-0) po/nl.po (+103/-0) po/nn.po (+103/-0) po/oc.po (+103/-0) po/pa.po (+100/-0) po/pl.po (+104/-0) po/ps.po (+93/-0) po/pt.po (+103/-0) po/pt_BR.po (+103/-0) po/pt_PT.po (+93/-0) po/qu.po (+93/-0) po/ro.po (+104/-0) po/ru.po (+103/-0) po/sco.po (+93/-0) po/sd.po (+93/-0) po/se.po (+93/-0) po/shn.po (+93/-0) po/si.po (+100/-0) po/sk.po (+103/-0) po/sl.po (+105/-0) po/sq.po (+103/-0) po/sr.po (+103/-0) po/st.po (+93/-0) po/sv.po (+103/-0) po/ta.po (+97/-0) po/te.po (+102/-0) po/tg.po (+103/-0) po/th.po (+101/-0) po/tl.po (+99/-0) po/tr.po (+102/-0) po/ug.po (+101/-0) po/uk.po (+103/-0) po/ur.po (+93/-0) po/uz.po (+99/-0) po/vi.po (+101/-0) po/xh.po (+93/-0) po/zh_CN.po (+101/-0) po/zh_HK.po (+101/-0) po/zh_TW.po (+101/-0) src/Makefile.am (+23/-0) src/avahi.c (+47/-0) src/avahi.h (+3/-0) src/crash.c (+13/-0) src/hooks.c (+6/-0) src/livepatch-tray.c (+16/-0) src/livepatch-utils.c (+4/-0) src/livepatch-utils.h (+9/-0) src/system-crash.c (+8/-0) src/update-notifier.c (+43/-0) src/update-notifier.h (+16/-0) src/update.c (+8/-0) tests/pyflakes.exclude (+4/-0) tests/test_motd.py (+88/-0) tests/test_pep8.py (+39/-0) Conflict in autogen.sh Conflict in config.h.in Conflict in configure.ac Conflict in data/Makefile.am Conflict in data/apt_check.py Conflict in data/backend_helper.py Conflict in data/com.ubuntu.update-notifier.gschema.xml.in Conflict in data/notify-reboot-required Conflict in data/package-data-downloader Conflict in data/update-motd-fsck-at-reboot Conflict in data/update-motd-hwe-eol Conflict in data/update-motd-updates-available Conflict in debian/90-updates-available Conflict in debian/95-hwe-eol Conflict in debian/changelog Conflict in debian/compat Conflict in debian/control Conflict in debian/rules Conflict in debian/systemd/update-notifier-crash.path Conflict in debian/systemd/update-notifier-crash.service Conflict in debian/tests/control Conflict in debian/update-notifier-common.install Conflict in debian/update-notifier-common.postinst Conflict in debian/update-notifier-common.triggers Conflict in debian/update-notifier-crash Conflict in debian/update-notifier.install Conflict in debian/update-notifier.links Conflict in po/POTFILES.in Conflict in po/ace.po Conflict in po/af.po Conflict in po/am.po Conflict in po/an.po Conflict in po/ar.po Conflict in po/ast.po Conflict in po/az.po Conflict in po/be.po Conflict in po/bem.po Conflict in po/bg.po Conflict in po/bn.po Conflict in po/bo.po Conflict in po/br.po Conflict in po/bs.po Conflict in po/ca.po Conflict in po/ca@valencia.po Conflict in po/ckb.po Conflict in po/crh.po Conflict in po/cs.po Conflict in po/csb.po Conflict in po/cv.po Conflict in po/cy.po Conflict in po/da.po Conflict in po/de.po Conflict in po/de_DE.po Conflict in po/dv.po Conflict in po/el.po Conflict in po/en.po Conflict in po/en_AU.po Conflict in po/en_CA.po Conflict in po/en_GB.po Conflict in po/eo.po Conflict in po/es.po Conflict in po/et.po Conflict in po/eu.po Conflict in po/fa.po Conflict in po/fa_AF.po Conflict in po/fi.po Conflict in po/fil.po Conflict in po/fo.po Conflict in po/fr.po Conflict in po/fr_CA.po Conflict in po/fur.po Conflict in po/fy.po Conflict in po/ga.po Conflict in po/gd.po Conflict in po/gl.po Conflict in po/gu.po Conflict in po/he.po Conflict in po/hi.po Conflict in po/hr.po Conflict in po/hu.po Conflict in po/hy.po Conflict in po/id.po Conflict in po/is.po Conflict in po/it.po Conflict in po/ja.po Conflict in po/jv.po Conflict in po/ka.po Conflict in po/kk.po Conflict in po/km.po Conflict in po/kn.po Conflict in po/ko.po Conflict in po/ku.po Conflict in po/ky.po Conflict in po/lo.po Conflict in po/lt.po Conflict in po/lv.po Conflict in po/mhr.po Conflict in po/mi.po Conflict in po/mk.po Conflict in po/ml.po Conflict in po/mn.po Conflict in po/mr.po Conflict in po/ms.po Conflict in po/mt.po Conflict in po/my.po Conflict in po/nb.po Conflict in po/nds.po Conflict in po/ne.po Conflict in po/nl.po Conflict in po/nn.po Conflict in po/oc.po Conflict in po/pa.po Conflict in po/pl.po Conflict in po/ps.po Conflict in po/pt.po Conflict in po/pt_BR.po Conflict in po/pt_PT.po Conflict in po/qu.po Conflict in po/ro.po Conflict in po/ru.po Conflict in po/sco.po Conflict in po/sd.po Conflict in po/se.po Conflict in po/shn.po Conflict in po/si.po Conflict in po/sk.po Conflict in po/sl.po Conflict in po/sq.po Conflict in po/sr.po Conflict in po/st.po Conflict in po/sv.po Conflict in po/ta.po Conflict in po/te.po Conflict in po/tg.po Conflict in po/th.po Conflict in po/tl.po Conflict in po/tr.po Conflict in po/ug.po Conflict in po/uk.po Conflict in po/ur.po Conflict in po/uz.po Conflict in po/vi.po Conflict in po/xh.po Conflict in po/zh_CN.po Conflict in po/zh_HK.po Conflict in po/zh_TW.po Conflict in src/Makefile.am Conflict in src/crash.c Conflict in src/hooks.c Conflict in src/livepatch-tray.c Conflict in src/livepatch-utils.c Conflict in src/livepatch-utils.h Conflict in src/system-crash.c Conflict in src/update-notifier.c Conflict in src/update-notifier.h Conflict in src/update.c Conflict in tests/pyflakes.exclude Conflict in tests/test_motd.py |
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
git-ubuntu import | Pending | ||
Review via email: mp+430317@code.launchpad.net |
Commit message
Description of the change
Bionic release for Pro rebranding
Unmerged commits
- 4196706... by Lucas Albuquerque Medeiros de Moura
-
New bionic release
- 7eced80... by Lucas Albuquerque Medeiros de Moura
-
apt_check: update ESM service name (LP: #1980368)
Update naming and description for ESM services advertised
by the apt_check script - b857547... by Sebastien Bacher
-
Update Vcs information
- 8e8efd3... by Brian Murray
-
Sleep for up to an hour in the background in order to spread the load of checking for release updates on the Ubuntu infrastructure (LP: #1836475)
- 93a31a3... by Lucas Albuquerque Medeiros de Moura
-
* debian/control: add lsb-release to the update-
notifier- common depends as
it is used by apt-cdrom-check. (LP: #1927996)
* data/apt_check.py
- Only show esm-apps alerts on lts and non-esm distros (LP: #1926990)
- Update esm-infra alert for distros on ESM mode
- Show message with number of upgradable packages even if that
number is zero (LP: #1926819)
- Get distro name and version directly from /etc/os-release
- Fallback to lsb_release command if there are any problems using
/etc/os-release as source of information
- Show esm-apps status header when running on LTS distro that
has not yet entered Extended Security Maintenance - fb21122... by Lucas Albuquerque Medeiros de Moura
-
* data/apt_check.py:
- Add support to handle packages from ESM Apps in addition to ESM Infra
and only display alerts if the distro is ESM. (LP: #1924766)
- Do not display a count of ESM packages if the system does not have ESM
enabled. (LP: #1883315)
- Make distinction between standard security updates and ESM updates
when performing package counts. (LP: #1926208)
- use 'applied' instead of 'installed', redact 0 of these updates are
security updates, and correct singular messages
* debian/control: Add a dependency on python3-distro- info. - 3c6fca4... by Chad Smith
-
* data/apt_check.py: Update UA Infra: ESM product name and doc url
(LP: #1901627)
- data/apt_check.py: Update name and URL
- tests/test_motd.py: adapt unittests to match new behavior
- po/*.po: translation files with intltool-update -r
* Fix pep8/pyflakes autopkgtest failures (LP: #1906436)
- d/control: add explicit pep8 build-requires dependency
- test_motd.py: remove unused imports
- pyflakes: data/backend_helper fix unittests for unreferenced
variables
- data/apt_check & data/backend_helper: resolve underindent pep8 issues
backport of 9e0f7ee50 [ Brian Murray ]
- data/apt_check.py, data/package-data-downloader , tests/test_pep8.py:
+ update the code formating to be not hit W504 warnings,
change to ignore W503 and be consistent with update-manager.
- INSTALL, data/hooks.py, tests/test_package- data-downloader .py:
Fix E117 over-indented pep issues. [ Gianfranco Costamagna ]
- test_motd.py: Remove unused imports [ Julian Andres Klode ]
- pyflakes: data/backend_helper fix unittests for unreferenced variables - 79fd8db... by Chad Smith
-
* data/apt_check.py: Update ESM security pockets names (LP: #1881632)
- the UbuntuESM pocket was renamed from <distro>-security to
<distro>-infra- security
- new origin UbuntuESMApps, with a corresponding pocket of
<distro>-apps-security
* data/apt_check.py: modify wording and output regarding ESM support.
(LP: #1842508)
* Handle missing cases of LP: #1822340, where we told people ESM is not
enabled, but not how to enable it.
* Fix multiple disabled ESM repositories being counted as enabled ones. - 42bf0bd... by Sebastien Bacher
-
Update Vcs information
- 200bfaf... by Sebastien Bacher
-
releasing package update-notifier version 3.192.1.7
Preview Diff
1 | diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf | |||
2 | 0 | new file mode 100644 | 0 | new file mode 100644 |
3 | index 0000000..37780be | |||
4 | --- /dev/null | |||
5 | +++ b/.bzr-builddeb/default.conf | |||
6 | @@ -0,0 +1,5 @@ | |||
7 | 1 | [BUILDDEB] | ||
8 | 2 | native = True | ||
9 | 3 | |||
10 | 4 | [HOOKS] | ||
11 | 5 | pre-build = ./autogen.sh | ||
12 | diff --git a/.bzrignore b/.bzrignore | |||
13 | 0 | new file mode 100644 | 6 | new file mode 100644 |
14 | index 0000000..126e770 | |||
15 | --- /dev/null | |||
16 | +++ b/.bzrignore | |||
17 | @@ -0,0 +1,31 @@ | |||
18 | 1 | Makefile | ||
19 | 2 | Makefile.in | ||
20 | 3 | *.gmo | ||
21 | 4 | aclocal.m4 | ||
22 | 5 | build-stamp | ||
23 | 6 | config.h | ||
24 | 7 | config.log | ||
25 | 8 | config.guess | ||
26 | 9 | config.status | ||
27 | 10 | config.sub | ||
28 | 11 | configure | ||
29 | 12 | debian/*.debhelper | ||
30 | 13 | debian/*.debhelper.log | ||
31 | 14 | debian/*.substvars | ||
32 | 15 | debian/files | ||
33 | 16 | debian/tmp/ | ||
34 | 17 | debian/update-notifier/ | ||
35 | 18 | debian/update-notifier-common/ | ||
36 | 19 | depcomp | ||
37 | 20 | install-sh | ||
38 | 21 | missing | ||
39 | 22 | stamp-h1 | ||
40 | 23 | po/.intltool-merge-cache | ||
41 | 24 | po/Makefile.in.in | ||
42 | 25 | po/POTFILES | ||
43 | 26 | po/stamp-it | ||
44 | 27 | po/update-notifier.pot | ||
45 | 28 | src/.deps | ||
46 | 29 | src/update-notifier | ||
47 | 30 | data/update-notifier.desktop | ||
48 | 31 | data/update-notifier.schemas | ||
49 | diff --git a/autogen.sh b/autogen.sh | |||
50 | index b36b4e9..00d2d46 100755 | |||
51 | --- a/autogen.sh | |||
52 | +++ b/autogen.sh | |||
53 | @@ -15,11 +15,28 @@ PKG_NAME="Update Notifier" | |||
54 | 15 | exit 1 | 15 | exit 1 |
55 | 16 | } | 16 | } |
56 | 17 | 17 | ||
57 | 18 | <<<<<<< autogen.sh | ||
58 | 18 | dpkg-checkbuilddeps -d 'libtool, automake, intltool, libglib2.0-dev' | 19 | dpkg-checkbuilddeps -d 'libtool, automake, intltool, libglib2.0-dev' |
59 | 19 | 20 | ||
60 | 21 | ======= | ||
61 | 22 | dpkg-checkbuilddeps -d 'libtool, automake, intltool, libglib2.0-dev, gnome-common' | ||
62 | 23 | |||
63 | 24 | # do not use gnome-autogen.sh as long as it's broken | ||
64 | 25 | >>>>>>> autogen.sh | ||
65 | 20 | cd "$srcdir" | 26 | cd "$srcdir" |
66 | 21 | autoreconf --force -i -v | 27 | autoreconf --force -i -v |
67 | 22 | intltoolize -c | 28 | intltoolize -c |
68 | 23 | aclocal | 29 | aclocal |
69 | 24 | rm -rf autom4te.cache | 30 | rm -rf autom4te.cache |
70 | 25 | cd po; intltool-update -p --verbose | 31 | cd po; intltool-update -p --verbose |
71 | 32 | <<<<<<< autogen.sh | ||
72 | 33 | ======= | ||
73 | 34 | exit 0 | ||
74 | 35 | |||
75 | 36 | which gnome-autogen.sh || { | ||
76 | 37 | echo "You need to install gnome-common" | ||
77 | 38 | exit 1 | ||
78 | 39 | } | ||
79 | 40 | |||
80 | 41 | USE_GNOME2_MACROS=1 . gnome-autogen.sh | ||
81 | 42 | >>>>>>> autogen.sh | ||
82 | diff --git a/config.h.in b/config.h.in | |||
83 | index fb9979f..f2c6e2d 100644 | |||
84 | --- a/config.h.in | |||
85 | +++ b/config.h.in | |||
86 | @@ -15,6 +15,7 @@ | |||
87 | 15 | /* Define to 1 if you have the `bind_textdomain_codeset' function. */ | 15 | /* Define to 1 if you have the `bind_textdomain_codeset' function. */ |
88 | 16 | #undef HAVE_BIND_TEXTDOMAIN_CODESET | 16 | #undef HAVE_BIND_TEXTDOMAIN_CODESET |
89 | 17 | 17 | ||
90 | 18 | <<<<<<< config.h.in | ||
91 | 18 | /* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the | 19 | /* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the |
92 | 19 | CoreFoundation framework. */ | 20 | CoreFoundation framework. */ |
93 | 20 | #undef HAVE_CFLOCALECOPYCURRENT | 21 | #undef HAVE_CFLOCALECOPYCURRENT |
94 | @@ -23,6 +24,8 @@ | |||
95 | 23 | the CoreFoundation framework. */ | 24 | the CoreFoundation framework. */ |
96 | 24 | #undef HAVE_CFPREFERENCESCOPYAPPVALUE | 25 | #undef HAVE_CFPREFERENCESCOPYAPPVALUE |
97 | 25 | 26 | ||
98 | 27 | ======= | ||
99 | 28 | >>>>>>> config.h.in | ||
100 | 26 | /* Define to 1 if you have the `dcgettext' function. */ | 29 | /* Define to 1 if you have the `dcgettext' function. */ |
101 | 27 | #undef HAVE_DCGETTEXT | 30 | #undef HAVE_DCGETTEXT |
102 | 28 | 31 | ||
103 | diff --git a/configure.ac b/configure.ac | |||
104 | index 100e7ad..042136f 100644 | |||
105 | --- a/configure.ac | |||
106 | +++ b/configure.ac | |||
107 | @@ -72,16 +72,27 @@ AC_ARG_ENABLE(appindicator, | |||
108 | 72 | [enable_appindicator="auto"]) | 72 | [enable_appindicator="auto"]) |
109 | 73 | 73 | ||
110 | 74 | if test x$enable_appindicator = xauto ; then | 74 | if test x$enable_appindicator = xauto ; then |
111 | 75 | <<<<<<< configure.ac | ||
112 | 75 | PKG_CHECK_EXISTS([ayatana-appindicator3-0.1 >= $APPINDICATOR_REQUIRED], | 76 | PKG_CHECK_EXISTS([ayatana-appindicator3-0.1 >= $APPINDICATOR_REQUIRED], |
113 | 77 | ======= | ||
114 | 78 | PKG_CHECK_EXISTS([appindicator3-0.1 >= $APPINDICATOR_REQUIRED], | ||
115 | 79 | >>>>>>> configure.ac | ||
116 | 76 | enable_appindicator="yes", | 80 | enable_appindicator="yes", |
117 | 77 | enable_appindicator="no") | 81 | enable_appindicator="no") |
118 | 78 | fi | 82 | fi |
119 | 79 | 83 | ||
120 | 80 | if test x$enable_appindicator = xyes ; then | 84 | if test x$enable_appindicator = xyes ; then |
121 | 85 | <<<<<<< configure.ac | ||
122 | 81 | PKG_CHECK_EXISTS([ayatana-appindicator3-0.1 >= $APPINDICATOR_REQUIRED],, | 86 | PKG_CHECK_EXISTS([ayatana-appindicator3-0.1 >= $APPINDICATOR_REQUIRED],, |
123 | 82 | AC_MSG_ERROR([ayatana-appindicator3-0.1 is not installed])) | 87 | AC_MSG_ERROR([ayatana-appindicator3-0.1 is not installed])) |
124 | 83 | PKG_CHECK_MODULES(APP_INDICATOR, | 88 | PKG_CHECK_MODULES(APP_INDICATOR, |
125 | 84 | ayatana-appindicator3-0.1 >= $APPINDICATOR_REQUIRED) | 89 | ayatana-appindicator3-0.1 >= $APPINDICATOR_REQUIRED) |
126 | 90 | ======= | ||
127 | 91 | PKG_CHECK_EXISTS([appindicator3-0.1 >= $APPINDICATOR_REQUIRED],, | ||
128 | 92 | AC_MSG_ERROR([appindicator3-0.1 is not installed])) | ||
129 | 93 | PKG_CHECK_MODULES(APP_INDICATOR, | ||
130 | 94 | appindicator3-0.1 >= $APPINDICATOR_REQUIRED) | ||
131 | 95 | >>>>>>> configure.ac | ||
132 | 85 | AC_SUBST(APP_INDICATOR_CFLAGS) | 96 | AC_SUBST(APP_INDICATOR_CFLAGS) |
133 | 86 | AC_SUBST(APP_INDICATOR_LIBS) | 97 | AC_SUBST(APP_INDICATOR_LIBS) |
134 | 87 | AC_DEFINE(HAVE_APP_INDICATOR, 1, [Have AppIndicator]) | 98 | AC_DEFINE(HAVE_APP_INDICATOR, 1, [Have AppIndicator]) |
135 | diff --git a/data/Makefile.am b/data/Makefile.am | |||
136 | index 3a2cc29..62b42e2 100644 | |||
137 | --- a/data/Makefile.am | |||
138 | +++ b/data/Makefile.am | |||
139 | @@ -1,7 +1,11 @@ | |||
140 | 1 | @INTLTOOL_DESKTOP_RULE@ | 1 | @INTLTOOL_DESKTOP_RULE@ |
141 | 2 | 2 | ||
142 | 3 | desktopdir = $(sysconfdir)/xdg/autostart | 3 | desktopdir = $(sysconfdir)/xdg/autostart |
143 | 4 | <<<<<<< data/Makefile.am | ||
144 | 4 | desktop_in_files = update-notifier.desktop.in ubuntu-advantage-notification.desktop.in | 5 | desktop_in_files = update-notifier.desktop.in ubuntu-advantage-notification.desktop.in |
145 | 6 | ======= | ||
146 | 7 | desktop_in_files = update-notifier.desktop.in | ||
147 | 8 | >>>>>>> data/Makefile.am | ||
148 | 5 | desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) | 9 | desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) |
149 | 6 | 10 | ||
150 | 7 | @INTLTOOL_XML_NOMERGE_RULE@ | 11 | @INTLTOOL_XML_NOMERGE_RULE@ |
151 | @@ -13,10 +17,17 @@ policydir = $(datadir)/polkit-1/actions | |||
152 | 13 | policy_DATA = com.ubuntu.update-notifier.policy | 17 | policy_DATA = com.ubuntu.update-notifier.policy |
153 | 14 | 18 | ||
154 | 15 | helperdir = $(libdir)/update-notifier | 19 | helperdir = $(libdir)/update-notifier |
155 | 20 | <<<<<<< data/Makefile.am | ||
156 | 16 | helper_SCRIPTS = apt_check.py apt-cdrom-check cddistupgrader list-oem-metapackages update-motd-reboot-required update-motd-updates-available update-motd-fsck-at-reboot update-motd-hwe-eol backend_helper.py package-data-downloader package-system-locked | 21 | helper_SCRIPTS = apt_check.py apt-cdrom-check cddistupgrader list-oem-metapackages update-motd-reboot-required update-motd-updates-available update-motd-fsck-at-reboot update-motd-hwe-eol backend_helper.py package-data-downloader package-system-locked |
157 | 17 | 22 | ||
158 | 18 | notifydir = $(datadir)/update-notifier | 23 | notifydir = $(datadir)/update-notifier |
159 | 19 | notify_SCRIPTS = notify-reboot-required notify-updates-outdated | 24 | notify_SCRIPTS = notify-reboot-required notify-updates-outdated |
160 | 25 | ======= | ||
161 | 26 | helper_SCRIPTS = apt_check.py apt-cdrom-check cddistupgrader update-motd-reboot-required update-motd-updates-available update-motd-fsck-at-reboot update-motd-hwe-eol backend_helper.py package-data-downloader package-system-locked | ||
162 | 27 | |||
163 | 28 | notifydir = $(datadir)/update-notifier | ||
164 | 29 | notify_SCRIPTS = notify-reboot-required | ||
165 | 30 | >>>>>>> data/Makefile.am | ||
166 | 20 | notify_in_files = package-data-downloads-failed.in package-data-downloads-failed-permanently.in | 31 | notify_in_files = package-data-downloads-failed.in package-data-downloads-failed-permanently.in |
167 | 21 | notify_DATA = $(notify_in_files:.in=) | 32 | notify_DATA = $(notify_in_files:.in=) |
168 | 22 | 33 | ||
169 | diff --git a/data/apt_check.py b/data/apt_check.py | |||
170 | index 6e0ffd1..eb3fe7d 100755 | |||
171 | --- a/data/apt_check.py | |||
172 | +++ b/data/apt_check.py | |||
173 | @@ -11,6 +11,10 @@ from optparse import OptionParser | |||
174 | 11 | import re | 11 | import re |
175 | 12 | import gettext | 12 | import gettext |
176 | 13 | import distro_info | 13 | import distro_info |
177 | 14 | <<<<<<< data/apt_check.py | ||
178 | 15 | ======= | ||
179 | 16 | import subprocess | ||
180 | 17 | >>>>>>> data/apt_check.py | ||
181 | 14 | 18 | ||
182 | 15 | 19 | ||
183 | 16 | SYNAPTIC_PINFILE = "/var/lib/synaptic/preferences" | 20 | SYNAPTIC_PINFILE = "/var/lib/synaptic/preferences" |
184 | @@ -41,9 +45,28 @@ def _get_info_from_os_release(key): | |||
185 | 41 | ) | 45 | ) |
186 | 42 | 46 | ||
187 | 43 | 47 | ||
188 | 48 | <<<<<<< data/apt_check.py | ||
189 | 44 | def get_distro(): | 49 | def get_distro(): |
190 | 45 | " get distro name " | 50 | " get distro name " |
191 | 46 | return _get_info_from_os_release(key="UBUNTU_CODENAME") | 51 | return _get_info_from_os_release(key="UBUNTU_CODENAME") |
192 | 52 | ======= | ||
193 | 53 | def _get_output_from_lsb_release(lsb_option): | ||
194 | 54 | " get info from lsb_release output " | ||
195 | 55 | return subprocess.check_output( | ||
196 | 56 | ["lsb_release", lsb_option, "-s"], universal_newlines=True | ||
197 | 57 | ).strip() | ||
198 | 58 | |||
199 | 59 | |||
200 | 60 | def get_distro(): | ||
201 | 61 | " get distro name " | ||
202 | 62 | try: | ||
203 | 63 | return _get_info_from_os_release(key="UBUNTU_CODENAME") | ||
204 | 64 | except Exception: | ||
205 | 65 | # If the system does not have os-release file or does not have the | ||
206 | 66 | # required entry in it, we will get the distro name from lsb_release | ||
207 | 67 | # command | ||
208 | 68 | return _get_output_from_lsb_release("-c") | ||
209 | 69 | >>>>>>> data/apt_check.py | ||
210 | 47 | 70 | ||
211 | 48 | 71 | ||
212 | 49 | DISTRO = get_distro() | 72 | DISTRO = get_distro() |
213 | @@ -64,7 +87,17 @@ def _handleException(type, value, tb): | |||
214 | 64 | 87 | ||
215 | 65 | def get_distro_version(): | 88 | def get_distro_version(): |
216 | 66 | " get distro version " | 89 | " get distro version " |
217 | 90 | <<<<<<< data/apt_check.py | ||
218 | 67 | return _get_info_from_os_release(key="VERSION_ID").replace('"', "") | 91 | return _get_info_from_os_release(key="VERSION_ID").replace('"', "") |
219 | 92 | ======= | ||
220 | 93 | try: | ||
221 | 94 | return _get_info_from_os_release(key="VERSION_ID").replace('"', "") | ||
222 | 95 | except Exception: | ||
223 | 96 | # If the system does not have os-release file or does not have the | ||
224 | 97 | # required entry in it, we will get the distro name from lsb_release | ||
225 | 98 | # command | ||
226 | 99 | return _get_output_from_lsb_release("-r") | ||
227 | 100 | >>>>>>> data/apt_check.py | ||
228 | 68 | 101 | ||
229 | 69 | 102 | ||
230 | 70 | def clean(cache, depcache): | 103 | def clean(cache, depcache): |
231 | @@ -208,12 +241,21 @@ def _output_esm_package_alert( | |||
232 | 208 | def _output_esm_service_status(outstream, have_esm_service, service_type): | 241 | def _output_esm_service_status(outstream, have_esm_service, service_type): |
233 | 209 | if have_esm_service: | 242 | if have_esm_service: |
234 | 210 | outstream.write(gettext.dgettext("update-notifier", | 243 | outstream.write(gettext.dgettext("update-notifier", |
235 | 244 | <<<<<<< data/apt_check.py | ||
236 | 211 | "Expanded Security Maintenance for " | 245 | "Expanded Security Maintenance for " |
237 | 212 | "%s is enabled.") % service_type) | 246 | "%s is enabled.") % service_type) |
238 | 213 | else: | 247 | else: |
239 | 214 | outstream.write(gettext.dgettext("update-notifier", | 248 | outstream.write(gettext.dgettext("update-notifier", |
240 | 215 | "Expanded Security Maintenance for " | 249 | "Expanded Security Maintenance for " |
241 | 216 | "%s is not enabled.") % service_type) | 250 | "%s is not enabled.") % service_type) |
242 | 251 | ======= | ||
243 | 252 | "Expanded Security Maintenance for %s is " | ||
244 | 253 | "enabled.") % service_type) | ||
245 | 254 | else: | ||
246 | 255 | outstream.write(gettext.dgettext("update-notifier", | ||
247 | 256 | "Expanded Security Maintenance for %s is " | ||
248 | 257 | "not enabled.") % service_type) | ||
249 | 258 | >>>>>>> data/apt_check.py | ||
250 | 217 | outstream.write("\n\n") | 259 | outstream.write("\n\n") |
251 | 218 | 260 | ||
252 | 219 | 261 | ||
253 | @@ -223,7 +265,11 @@ def write_human_readable_summary(outstream, upgrades, security_updates, | |||
254 | 223 | disabled_esm_infra_updates, | 265 | disabled_esm_infra_updates, |
255 | 224 | disabled_esm_apps_updates): | 266 | disabled_esm_apps_updates): |
256 | 225 | 267 | ||
257 | 268 | <<<<<<< data/apt_check.py | ||
258 | 226 | " write out human summary summary to outstream " | 269 | " write out human summary summary to outstream " |
259 | 270 | ======= | ||
260 | 271 | " write out human summary to outstream " | ||
261 | 272 | >>>>>>> data/apt_check.py | ||
262 | 227 | esm_distro = is_esm_distro() | 273 | esm_distro = is_esm_distro() |
263 | 228 | lts_distro = is_lts_distro() | 274 | lts_distro = is_lts_distro() |
264 | 229 | 275 | ||
265 | diff --git a/data/backend_helper.py b/data/backend_helper.py | |||
266 | index b4cb3b8..5160a4d 100755 | |||
267 | --- a/data/backend_helper.py | |||
268 | +++ b/data/backend_helper.py | |||
269 | @@ -18,12 +18,18 @@ except ImportError: | |||
270 | 18 | # show updates | 18 | # show updates |
271 | 19 | def show_updates(): | 19 | def show_updates(): |
272 | 20 | """ show updates using update-manager """ | 20 | """ show updates using update-manager """ |
273 | 21 | <<<<<<< data/backend_helper.py | ||
274 | 21 | if os.path.exists("/usr/bin/update-manager"): | 22 | if os.path.exists("/usr/bin/update-manager"): |
275 | 22 | cmd = ["update-manager", "--no-update"] | 23 | cmd = ["update-manager", "--no-update"] |
276 | 23 | res = subprocess.call(cmd) | 24 | res = subprocess.call(cmd) |
277 | 24 | return (res == 0) | 25 | return (res == 0) |
278 | 25 | else: | 26 | else: |
279 | 26 | logging.error("update-manager is not installed") | 27 | logging.error("update-manager is not installed") |
280 | 28 | ======= | ||
281 | 29 | cmd = ["update-manager", "--no-update"] | ||
282 | 30 | res = subprocess.call(cmd) | ||
283 | 31 | return (res == 0) | ||
284 | 32 | >>>>>>> data/backend_helper.py | ||
285 | 27 | 33 | ||
286 | 28 | 34 | ||
287 | 29 | # install all updates | 35 | # install all updates |
288 | diff --git a/data/com.ubuntu.update-notifier.gschema.xml.in b/data/com.ubuntu.update-notifier.gschema.xml.in | |||
289 | index b935b5a..55b3db0 100644 | |||
290 | --- a/data/com.ubuntu.update-notifier.gschema.xml.in | |||
291 | +++ b/data/com.ubuntu.update-notifier.gschema.xml.in | |||
292 | @@ -28,12 +28,16 @@ | |||
293 | 28 | <key name="show-livepatch-status-icon" type="b"> | 28 | <key name="show-livepatch-status-icon" type="b"> |
294 | 29 | <default>true</default> | 29 | <default>true</default> |
295 | 30 | <summary>Show Livepatch status icon</summary> | 30 | <summary>Show Livepatch status icon</summary> |
296 | 31 | <<<<<<< data/com.ubuntu.update-notifier.gschema.xml.in | ||
297 | 31 | <description>Enable or disable the Livepatch status icon in the systray.</description> | 32 | <description>Enable or disable the Livepatch status icon in the systray.</description> |
298 | 32 | </key> | 33 | </key> |
299 | 33 | <key name="notify-ubuntu-advantage-available" type="b"> | 34 | <key name="notify-ubuntu-advantage-available" type="b"> |
300 | 34 | <default>false</default> | 35 | <default>false</default> |
301 | 35 | <summary>Notify user is able to attach to Ubuntu Advantage</summary> | 36 | <summary>Notify user is able to attach to Ubuntu Advantage</summary> |
302 | 36 | <description>If the user should be notified that they are not connected to Ubuntu advantage. Set to False if the user has opted out of these notifications.</description> | 37 | <description>If the user should be notified that they are not connected to Ubuntu advantage. Set to False if the user has opted out of these notifications.</description> |
303 | 38 | ======= | ||
304 | 39 | <description>Enable or diable the Livepatch status icon in the systray.</description> | ||
305 | 40 | >>>>>>> data/com.ubuntu.update-notifier.gschema.xml.in | ||
306 | 37 | </key> | 41 | </key> |
307 | 38 | </schema> | 42 | </schema> |
308 | 39 | </schemalist> | 43 | </schemalist> |
309 | diff --git a/data/notify-reboot-required b/data/notify-reboot-required | |||
310 | index ed9985b..927338e 100644 | |||
311 | --- a/data/notify-reboot-required | |||
312 | +++ b/data/notify-reboot-required | |||
313 | @@ -22,6 +22,7 @@ if [ "$0" = "/etc/kernel/postinst.d/update-notifier" ]; then | |||
314 | 22 | DPKG_MAINTSCRIPT_PACKAGE=linux-base | 22 | DPKG_MAINTSCRIPT_PACKAGE=linux-base |
315 | 23 | fi | 23 | fi |
316 | 24 | 24 | ||
317 | 25 | <<<<<<< data/notify-reboot-required | ||
318 | 25 | KERNEL_UPGRADED=0 | 26 | KERNEL_UPGRADED=0 |
319 | 26 | # Prefer showing the canonical-livepatch reboot message if one is required | 27 | # Prefer showing the canonical-livepatch reboot message if one is required |
320 | 27 | if [ -f "/snap/bin/canonical-livepatch" ]; then | 28 | if [ -f "/snap/bin/canonical-livepatch" ]; then |
321 | @@ -45,6 +46,8 @@ if [ $KERNEL_UPGRADED -eq 1 ]; then | |||
322 | 45 | fi | 46 | fi |
323 | 46 | fi | 47 | fi |
324 | 47 | 48 | ||
325 | 49 | ======= | ||
326 | 50 | >>>>>>> data/notify-reboot-required | ||
327 | 48 | # Wake the applet up | 51 | # Wake the applet up |
328 | 49 | echo "*** $(eval_gettext "System restart required") ***" > /var/run/reboot-required | 52 | echo "*** $(eval_gettext "System restart required") ***" > /var/run/reboot-required |
329 | 50 | echo "$DPKG_MAINTSCRIPT_PACKAGE" >> /var/run/reboot-required.pkgs | 53 | echo "$DPKG_MAINTSCRIPT_PACKAGE" >> /var/run/reboot-required.pkgs |
330 | diff --git a/data/package-data-downloader b/data/package-data-downloader | |||
331 | index 789142e..67b523d 100755 | |||
332 | --- a/data/package-data-downloader | |||
333 | +++ b/data/package-data-downloader | |||
334 | @@ -26,8 +26,11 @@ import string | |||
335 | 26 | import debconf | 26 | import debconf |
336 | 27 | from datetime import datetime | 27 | from datetime import datetime |
337 | 28 | 28 | ||
338 | 29 | <<<<<<< data/package-data-downloader | ||
339 | 29 | import apt_pkg | 30 | import apt_pkg |
340 | 30 | 31 | ||
341 | 32 | ======= | ||
342 | 33 | >>>>>>> data/package-data-downloader | ||
343 | 31 | # avoid hanging forever (LP: #1243090) | 34 | # avoid hanging forever (LP: #1243090) |
344 | 32 | import socket | 35 | import socket |
345 | 33 | socket.setdefaulttimeout(60) | 36 | socket.setdefaulttimeout(60) |
346 | @@ -178,6 +181,7 @@ def download_file(uri, sha256_hashsum): | |||
347 | 178 | """ | 181 | """ |
348 | 179 | download_dir = os.path.join(STAMPDIR, "partial") | 182 | download_dir = os.path.join(STAMPDIR, "partial") |
349 | 180 | dest_file = os.path.join(download_dir, os.path.basename(uri)) | 183 | dest_file = os.path.join(download_dir, os.path.basename(uri)) |
350 | 184 | <<<<<<< data/package-data-downloader | ||
351 | 181 | try: | 185 | try: |
352 | 182 | with open(dest_file, 'rb') as dest_file_obj: | 186 | with open(dest_file, 'rb') as dest_file_obj: |
353 | 183 | # apt_pkg can directly hash from file obj, let's use that instead | 187 | # apt_pkg can directly hash from file obj, let's use that instead |
354 | @@ -190,6 +194,8 @@ def download_file(uri, sha256_hashsum): | |||
355 | 190 | except FileNotFoundError: | 194 | except FileNotFoundError: |
356 | 191 | pass | 195 | pass |
357 | 192 | 196 | ||
358 | 197 | ======= | ||
359 | 198 | >>>>>>> data/package-data-downloader | ||
360 | 193 | ret = subprocess.call( | 199 | ret = subprocess.call( |
361 | 194 | ["/usr/lib/apt/apt-helper", | 200 | ["/usr/lib/apt/apt-helper", |
362 | 195 | "download-file", uri, dest_file, "SHA256:" + sha256_hashsum]) | 201 | "download-file", uri, dest_file, "SHA256:" + sha256_hashsum]) |
363 | diff --git a/data/update-motd-fsck-at-reboot b/data/update-motd-fsck-at-reboot | |||
364 | index c027236..e683c42 100755 | |||
365 | --- a/data/update-motd-fsck-at-reboot | |||
366 | +++ b/data/update-motd-fsck-at-reboot | |||
367 | @@ -7,11 +7,14 @@ set -e | |||
368 | 7 | # poor mans force | 7 | # poor mans force |
369 | 8 | if [ "$1" = "--force" ]; then | 8 | if [ "$1" = "--force" ]; then |
370 | 9 | NEEDS_FSCK_CHECK=yes | 9 | NEEDS_FSCK_CHECK=yes |
371 | 10 | <<<<<<< data/update-motd-fsck-at-reboot | ||
372 | 10 | else | 11 | else |
373 | 11 | if [ "$(id -u)" != 0 ] ; then | 12 | if [ "$(id -u)" != 0 ] ; then |
374 | 12 | exit | 13 | exit |
375 | 13 | fi | 14 | fi |
376 | 14 | NEED_FSCK_CHECK=no | 15 | NEED_FSCK_CHECK=no |
377 | 16 | ======= | ||
378 | 17 | >>>>>>> data/update-motd-fsck-at-reboot | ||
379 | 15 | fi | 18 | fi |
380 | 16 | 19 | ||
381 | 17 | # check time when we did the last check | 20 | # check time when we did the last check |
382 | @@ -38,7 +41,11 @@ if [ -n "$NEEDS_FSCK_CHECK" ]; then | |||
383 | 38 | { | 41 | { |
384 | 39 | check_occur_any= | 42 | check_occur_any= |
385 | 40 | 43 | ||
386 | 44 | <<<<<<< data/update-motd-fsck-at-reboot | ||
387 | 41 | ext_partitions=$(mount | awk '$5 ~ /^ext(2|3|4)$/ { print $1 }' | grep -v "/dev/nbd" || true) | 45 | ext_partitions=$(mount | awk '$5 ~ /^ext(2|3|4)$/ { print $1 }' | grep -v "/dev/nbd" || true) |
388 | 46 | ======= | ||
389 | 47 | ext_partitions=$(mount | awk '$5 ~ /^ext(2|3|4)$/ { print $1 }') | ||
390 | 48 | >>>>>>> data/update-motd-fsck-at-reboot | ||
391 | 42 | for part in $ext_partitions; do | 49 | for part in $ext_partitions; do |
392 | 43 | dumpe2fs_out=$(dumpe2fs -h $part 2>/dev/null) | 50 | dumpe2fs_out=$(dumpe2fs -h $part 2>/dev/null) |
393 | 44 | mount_count=$(echo "$dumpe2fs_out" | grep "^Mount count:"|cut -d':' -f 2-) | 51 | mount_count=$(echo "$dumpe2fs_out" | grep "^Mount count:"|cut -d':' -f 2-) |
394 | diff --git a/data/update-motd-hwe-eol b/data/update-motd-hwe-eol | |||
395 | index 68e6c73..4e3f5e3 100755 | |||
396 | --- a/data/update-motd-hwe-eol | |||
397 | +++ b/data/update-motd-hwe-eol | |||
398 | @@ -7,9 +7,12 @@ | |||
399 | 7 | if [ "$1" = "--force" ]; then | 7 | if [ "$1" = "--force" ]; then |
400 | 8 | NEED_EOL_CHECK=yes | 8 | NEED_EOL_CHECK=yes |
401 | 9 | else | 9 | else |
402 | 10 | <<<<<<< data/update-motd-hwe-eol | ||
403 | 10 | if type systemd-detect-virt > /dev/null 2>&1 && systemd-detect-virt -q -c; then | 11 | if type systemd-detect-virt > /dev/null 2>&1 && systemd-detect-virt -q -c; then |
404 | 11 | exit | 12 | exit |
405 | 12 | fi | 13 | fi |
406 | 14 | ======= | ||
407 | 15 | >>>>>>> data/update-motd-hwe-eol | ||
408 | 13 | NEED_EOL_CHECK=no | 16 | NEED_EOL_CHECK=no |
409 | 14 | fi | 17 | fi |
410 | 15 | 18 | ||
411 | @@ -37,21 +40,32 @@ cleanup() { rm -f "$tmpfile"; } | |||
412 | 37 | 40 | ||
413 | 38 | # check if we have a list file or sources.list that needs checking | 41 | # check if we have a list file or sources.list that needs checking |
414 | 39 | if [ -e "$stamp" ]; then | 42 | if [ -e "$stamp" ]; then |
415 | 43 | <<<<<<< data/update-motd-hwe-eol | ||
416 | 40 | if [ "$(find "/$StateDir/$ListDir" "/$EtcDir/$SourceList" "/$DpkgStatus" -type f -newer "$stamp" -print -quit 2> /dev/null)" ]; then | 44 | if [ "$(find "/$StateDir/$ListDir" "/$EtcDir/$SourceList" "/$DpkgStatus" -type f -newer "$stamp" -print -quit 2> /dev/null)" ]; then |
417 | 41 | NEED_EOL_CHECK=yes | 45 | NEED_EOL_CHECK=yes |
418 | 42 | fi | 46 | fi |
419 | 43 | else | 47 | else |
420 | 44 | if [ "$(find "/$StateDir/$ListDir" "/$EtcDir/$SourceList" -type f -print -quit 2> /dev/null)" ]; then | 48 | if [ "$(find "/$StateDir/$ListDir" "/$EtcDir/$SourceList" -type f -print -quit 2> /dev/null)" ]; then |
421 | 49 | ======= | ||
422 | 50 | if [ "$(find "/$StateDir/$ListDir" "/$EtcDir/$SourceList" "/$DpkgStatus" -type f -newer "$stamp" -print -quit)" ]; then | ||
423 | 51 | NEED_EOL_CHECK=yes | ||
424 | 52 | fi | ||
425 | 53 | else | ||
426 | 54 | if [ "$(find "/$StateDir/$ListDir" "/$EtcDir/$SourceList" -type f -print -quit)" ]; then | ||
427 | 55 | >>>>>>> data/update-motd-hwe-eol | ||
428 | 45 | NEED_EOL_CHECK=yes | 56 | NEED_EOL_CHECK=yes |
429 | 46 | fi | 57 | fi |
430 | 47 | fi | 58 | fi |
431 | 48 | 59 | ||
432 | 60 | <<<<<<< data/update-motd-hwe-eol | ||
433 | 49 | # only print status when running this script as a regular user | 61 | # only print status when running this script as a regular user |
434 | 50 | if [ "$(id -u)" != 0 ] ; then | 62 | if [ "$(id -u)" != 0 ] ; then |
435 | 51 | [ "$NEED_EOL_CHECK" = "no" ] || /usr/bin/hwe-support-status || true | 63 | [ "$NEED_EOL_CHECK" = "no" ] || /usr/bin/hwe-support-status || true |
436 | 52 | exit | 64 | exit |
437 | 53 | fi | 65 | fi |
438 | 54 | 66 | ||
439 | 67 | ======= | ||
440 | 68 | >>>>>>> data/update-motd-hwe-eol | ||
441 | 55 | tmpfile="" | 69 | tmpfile="" |
442 | 56 | trap cleanup EXIT | 70 | trap cleanup EXIT |
443 | 57 | tmpfile=$(mktemp -p $(dirname "$stamp")) | 71 | tmpfile=$(mktemp -p $(dirname "$stamp")) |
444 | diff --git a/data/update-motd-updates-available b/data/update-motd-updates-available | |||
445 | index 2f5e5b6..4404aad 100755 | |||
446 | --- a/data/update-motd-updates-available | |||
447 | +++ b/data/update-motd-updates-available | |||
448 | @@ -56,5 +56,8 @@ if [ "$NEED_UPDATE_CHECK" = "yes" ]; then | |||
449 | 56 | echo "" | 56 | echo "" |
450 | 57 | } > "$tmpfile" | 57 | } > "$tmpfile" |
451 | 58 | mv "$tmpfile" "$stamp" | 58 | mv "$tmpfile" "$stamp" |
452 | 59 | <<<<<<< data/update-motd-updates-available | ||
453 | 59 | chmod +r "$stamp" | 60 | chmod +r "$stamp" |
454 | 61 | ======= | ||
455 | 62 | >>>>>>> data/update-motd-updates-available | ||
456 | 60 | fi | 63 | fi |
457 | diff --git a/debian/90-updates-available b/debian/90-updates-available | |||
458 | index 9377fdc..6d8cbbe 100755 | |||
459 | --- a/debian/90-updates-available | |||
460 | +++ b/debian/90-updates-available | |||
461 | @@ -3,5 +3,8 @@ | |||
462 | 3 | stamp="/var/lib/update-notifier/updates-available" | 3 | stamp="/var/lib/update-notifier/updates-available" |
463 | 4 | 4 | ||
464 | 5 | [ ! -r "$stamp" ] || cat "$stamp" | 5 | [ ! -r "$stamp" ] || cat "$stamp" |
465 | 6 | <<<<<<< debian/90-updates-available | ||
466 | 6 | 7 | ||
467 | 7 | find $stamp -newermt 'now-7 days' 2> /dev/null | grep -q -m 1 '.' || /usr/share/update-notifier/notify-updates-outdated | 8 | find $stamp -newermt 'now-7 days' 2> /dev/null | grep -q -m 1 '.' || /usr/share/update-notifier/notify-updates-outdated |
468 | 9 | ======= | ||
469 | 10 | >>>>>>> debian/90-updates-available | ||
470 | diff --git a/debian/95-hwe-eol b/debian/95-hwe-eol | |||
471 | index 92d0c7d..4f754fc 100755 | |||
472 | --- a/debian/95-hwe-eol | |||
473 | +++ b/debian/95-hwe-eol | |||
474 | @@ -1,11 +1,14 @@ | |||
475 | 1 | #!/bin/sh | 1 | #!/bin/sh |
476 | 2 | 2 | ||
477 | 3 | <<<<<<< debian/95-hwe-eol | ||
478 | 3 | # this stamp is created and updated by /usr/lib/update-notifier/update-motd-hwe-eol | 4 | # this stamp is created and updated by /usr/lib/update-notifier/update-motd-hwe-eol |
479 | 4 | stamp="/var/lib/update-notifier/hwe-eol" | 5 | stamp="/var/lib/update-notifier/hwe-eol" |
480 | 5 | 6 | ||
481 | 6 | # do not try to refresh this more than once per day | 7 | # do not try to refresh this more than once per day |
482 | 7 | [ -z "$(find "$stamp" -newermt 'now-1 days' 2> /dev/null)" ] && exit 0 | 8 | [ -z "$(find "$stamp" -newermt 'now-1 days' 2> /dev/null)" ] && exit 0 |
483 | 8 | 9 | ||
484 | 10 | ======= | ||
485 | 11 | >>>>>>> debian/95-hwe-eol | ||
486 | 9 | if [ -x /usr/lib/update-notifier/update-motd-hwe-eol ]; then | 12 | if [ -x /usr/lib/update-notifier/update-motd-hwe-eol ]; then |
487 | 10 | exec /usr/lib/update-notifier/update-motd-hwe-eol | 13 | exec /usr/lib/update-notifier/update-motd-hwe-eol |
488 | 11 | fi | 14 | fi |
489 | diff --git a/debian/changelog b/debian/changelog | |||
490 | index 2efff87..75a90b3 100644 | |||
491 | --- a/debian/changelog | |||
492 | +++ b/debian/changelog | |||
493 | @@ -1,3 +1,4 @@ | |||
494 | 1 | <<<<<<< debian/changelog | ||
495 | 1 | update-notifier (3.192.57) kinetic; urgency=medium | 2 | update-notifier (3.192.57) kinetic; urgency=medium |
496 | 2 | 3 | ||
497 | 3 | [ Lucas Albuquerque Medeiros de Moura ] | 4 | [ Lucas Albuquerque Medeiros de Moura ] |
498 | @@ -120,12 +121,34 @@ update-notifier (3.192.44) impish; urgency=medium | |||
499 | 120 | update-notifier (3.192.43) impish; urgency=medium | 121 | update-notifier (3.192.43) impish; urgency=medium |
500 | 121 | 122 | ||
501 | 122 | [ Lucas Moura ] | 123 | [ Lucas Moura ] |
502 | 124 | ======= | ||
503 | 125 | update-notifier (3.192.1.13) bionic; urgency=medium | ||
504 | 126 | |||
505 | 127 | * Update the ESM service name and description for the apt_check.py script | ||
506 | 128 | (LP: #1980368). | ||
507 | 129 | |||
508 | 130 | -- Lucas Moura <lucas.moura@canonical.com> Thu, 22 Sep 2022 13:43:17 -0300 | ||
509 | 131 | |||
510 | 132 | update-notifier (3.192.1.12) bionic; urgency=medium | ||
511 | 133 | |||
512 | 134 | * Sleep for up to an hour in the background in order to spread the load | ||
513 | 135 | of checking for release updates on the Ubuntu infrastructure | ||
514 | 136 | (LP: #1836475) | ||
515 | 137 | |||
516 | 138 | -- Brian Murray <brian@ubuntu.com> Mon, 23 Aug 2021 15:33:27 -0700 | ||
517 | 139 | |||
518 | 140 | update-notifier (3.192.1.11) bionic; urgency=medium | ||
519 | 141 | |||
520 | 142 | * debian/control: add lsb-release to the update-notifier-common depends as | ||
521 | 143 | it is used by apt-cdrom-check. (LP: #1927996) | ||
522 | 144 | >>>>>>> debian/changelog | ||
523 | 123 | * data/apt_check.py | 145 | * data/apt_check.py |
524 | 124 | - Only show esm-apps alerts on lts and non-esm distros (LP: #1926990) | 146 | - Only show esm-apps alerts on lts and non-esm distros (LP: #1926990) |
525 | 125 | - Update esm-infra alert for distros on ESM mode | 147 | - Update esm-infra alert for distros on ESM mode |
526 | 126 | - Show message with number of upgradable packages even if that | 148 | - Show message with number of upgradable packages even if that |
527 | 127 | number is zero (LP: #1926819) | 149 | number is zero (LP: #1926819) |
528 | 128 | - Get distro name and version directly from /etc/os-release | 150 | - Get distro name and version directly from /etc/os-release |
529 | 151 | <<<<<<< debian/changelog | ||
530 | 129 | 152 | ||
531 | 130 | [ Brian Murray ] | 153 | [ Brian Murray ] |
532 | 131 | * debian/control: add lsb-release to the update-notifier-common depends as | 154 | * debian/control: add lsb-release to the update-notifier-common depends as |
533 | @@ -144,6 +167,17 @@ update-notifier (3.192.42) impish; urgency=medium | |||
534 | 144 | update-notifier (3.192.41) impish; urgency=medium | 167 | update-notifier (3.192.41) impish; urgency=medium |
535 | 145 | 168 | ||
536 | 146 | [ Lucas Moura ] | 169 | [ Lucas Moura ] |
537 | 170 | ======= | ||
538 | 171 | - Fallback to lsb_release command if there are any problems using | ||
539 | 172 | /etc/os-release as source of information | ||
540 | 173 | - Show esm-apps status header when running on LTS distro that | ||
541 | 174 | has not yet entered Extended Security Maintenance | ||
542 | 175 | |||
543 | 176 | -- Lucas Moura <lucas.moura@canonical.com> Fri, 14 May 2021 15:43:17 -0300 | ||
544 | 177 | |||
545 | 178 | update-notifier (3.192.1.10) bionic; urgency=medium | ||
546 | 179 | |||
547 | 180 | >>>>>>> debian/changelog | ||
548 | 147 | * data/apt_check.py: | 181 | * data/apt_check.py: |
549 | 148 | - Add support to handle packages from ESM Apps in addition to ESM Infra | 182 | - Add support to handle packages from ESM Apps in addition to ESM Infra |
550 | 149 | and only display alerts if the distro is ESM. (LP: #1924766) | 183 | and only display alerts if the distro is ESM. (LP: #1924766) |
551 | @@ -155,6 +189,7 @@ update-notifier (3.192.41) impish; urgency=medium | |||
552 | 155 | security updates, and correct singular messages | 189 | security updates, and correct singular messages |
553 | 156 | * debian/control: Add a dependency on python3-distro-info. | 190 | * debian/control: Add a dependency on python3-distro-info. |
554 | 157 | 191 | ||
555 | 192 | <<<<<<< debian/changelog | ||
556 | 158 | -- Chad Smith <chad.smith@canonical.com> Thu, 22 Apr 2021 17:47:19 -0600 | 193 | -- Chad Smith <chad.smith@canonical.com> Thu, 22 Apr 2021 17:47:19 -0600 |
557 | 159 | 194 | ||
558 | 160 | update-notifier (3.192.40) hirsute; urgency=medium | 195 | update-notifier (3.192.40) hirsute; urgency=medium |
559 | @@ -245,12 +280,45 @@ update-notifier (3.192.33) groovy; urgency=medium | |||
560 | 245 | update-notifier (3.192.32) groovy; urgency=medium | 280 | update-notifier (3.192.32) groovy; urgency=medium |
561 | 246 | 281 | ||
562 | 247 | [ Chad Smith ] | 282 | [ Chad Smith ] |
563 | 283 | ======= | ||
564 | 284 | -- Lucas Moura <lucas.moura@canonical.com> Thu, 22 Apr 2021 18:39:19 -0300 | ||
565 | 285 | |||
566 | 286 | update-notifier (3.192.1.9) bionic; urgency=medium | ||
567 | 287 | |||
568 | 288 | * data/apt_check.py: Update UA Infra: ESM product name and doc url | ||
569 | 289 | (LP: #1901627) | ||
570 | 290 | - data/apt_check.py: Update name and URL | ||
571 | 291 | - tests/test_motd.py: adapt unittests to match new behavior | ||
572 | 292 | - po/*.po: translation files with intltool-update -r | ||
573 | 293 | * Fix pep8/pyflakes autopkgtest failures (LP: #1906436) | ||
574 | 294 | - d/control: add explicit pep8 build-requires dependency | ||
575 | 295 | - test_motd.py: remove unused imports | ||
576 | 296 | - pyflakes: data/backend_helper fix unittests for unreferenced | ||
577 | 297 | variables | ||
578 | 298 | - data/apt_check & data/backend_helper: resolve underindent pep8 issues | ||
579 | 299 | backport of 9e0f7ee50 [ Brian Murray ] | ||
580 | 300 | - data/apt_check.py, data/package-data-downloader, tests/test_pep8.py: | ||
581 | 301 | + update the code formating to be not hit W504 warnings, | ||
582 | 302 | change to ignore W503 and be consistent with update-manager. | ||
583 | 303 | [ Andrea Azzarone ] | ||
584 | 304 | - INSTALL, data/hooks.py, tests/test_package-data-downloader.py: | ||
585 | 305 | Fix E117 over-indented pep issues. [ Gianfranco Costamagna ] | ||
586 | 306 | - test_motd.py: Remove unused imports [ Julian Andres Klode ] | ||
587 | 307 | - pyflakes: data/backend_helper fix unittests for unreferenced variables | ||
588 | 308 | |||
589 | 309 | -- Chad Smith <chad.smith@canonical.com> Mon, 30 Nov 2020 14:25:35 -0700 | ||
590 | 310 | |||
591 | 311 | update-notifier (3.192.1.8) bionic; urgency=medium | ||
592 | 312 | |||
593 | 313 | [ Andreas Hasenack ] | ||
594 | 314 | >>>>>>> debian/changelog | ||
595 | 248 | * data/apt_check.py: Update ESM security pockets names (LP: #1881632) | 315 | * data/apt_check.py: Update ESM security pockets names (LP: #1881632) |
596 | 249 | - the UbuntuESM pocket was renamed from <distro>-security to | 316 | - the UbuntuESM pocket was renamed from <distro>-security to |
597 | 250 | <distro>-infra-security | 317 | <distro>-infra-security |
598 | 251 | - new origin UbuntuESMApps, with a corresponding pocket of | 318 | - new origin UbuntuESMApps, with a corresponding pocket of |
599 | 252 | <distro>-apps-security | 319 | <distro>-apps-security |
600 | 253 | 320 | ||
601 | 321 | <<<<<<< debian/changelog | ||
602 | 254 | -- Andreas Hasenack <andreas@canonical.com> Fri, 12 Jun 2020 11:21:25 -0300 | 322 | -- Andreas Hasenack <andreas@canonical.com> Fri, 12 Jun 2020 11:21:25 -0300 |
603 | 255 | 323 | ||
604 | 256 | update-notifier (3.192.31) groovy; urgency=medium | 324 | update-notifier (3.192.31) groovy; urgency=medium |
605 | @@ -424,12 +492,50 @@ update-notifier (3.192.9) disco; urgency=medium | |||
606 | 424 | -- Brian Murray <brian@ubuntu.com> Tue, 13 Nov 2018 11:47:45 -0800 | 492 | -- Brian Murray <brian@ubuntu.com> Tue, 13 Nov 2018 11:47:45 -0800 |
607 | 425 | 493 | ||
608 | 426 | update-notifier (3.192.8) disco; urgency=medium | 494 | update-notifier (3.192.8) disco; urgency=medium |
609 | 495 | ======= | ||
610 | 496 | [ Brian Murray ] | ||
611 | 497 | * data/apt_check.py: modify wording and output regarding ESM support. | ||
612 | 498 | (LP: #1842508) | ||
613 | 499 | |||
614 | 500 | [ Julian Andres Klode ] | ||
615 | 501 | * Handle missing cases of LP: #1822340, where we told people ESM is not | ||
616 | 502 | enabled, but not how to enable it. | ||
617 | 503 | * Fix multiple disabled ESM repositories being counted as enabled ones. | ||
618 | 504 | |||
619 | 505 | -- Chad Smith <chad.smith@canonical.com> Tue, 29 Sep 2020 16:49:23 -0600 | ||
620 | 506 | |||
621 | 507 | update-notifier (3.192.1.7) bionic; urgency=medium | ||
622 | 508 | |||
623 | 509 | * Backport some fixes for the previous changes, from Andrea Azzarone | ||
624 | 510 | * Don't show the Livepatch indicator if livepatch is disabled. | ||
625 | 511 | * Livepatch, Handle "applying" Livepatch state | ||
626 | 512 | |||
627 | 513 | -- Sebastien Bacher <seb128@ubuntu.com> Fri, 24 May 2019 11:46:37 +0200 | ||
628 | 514 | |||
629 | 515 | update-notifier (3.192.1.6) bionic; urgency=medium | ||
630 | 516 | |||
631 | 517 | * Add a Livepatch indicator in the system tray. (LP: #1820259) | ||
632 | 518 | * Add a "Settings..." button to the Livepatch notification. (LP: #1823351) | ||
633 | 519 | |||
634 | 520 | -- Andrea Azzarone <andrea.azzarone@canonical.com> Fri, 05 Apr 2019 15:20:05 +0100 | ||
635 | 521 | |||
636 | 522 | update-notifier (3.192.1.5) bionic; urgency=medium | ||
637 | 523 | |||
638 | 524 | * [ Andrea Azzarone ] | ||
639 | 525 | * src/update-notifier.c: Don't use G_SPAWN_DO_NOT_REAP_CHILD in order | ||
640 | 526 | to avoid zombie processes. (LP: #1809505) | ||
641 | 527 | |||
642 | 528 | -- Sebastien Bacher <seb128@ubuntu.com> Thu, 17 Jan 2019 15:17:42 +0100 | ||
643 | 529 | |||
644 | 530 | update-notifier (3.192.1.4) bionic; urgency=medium | ||
645 | 531 | >>>>>>> debian/changelog | ||
646 | 427 | 532 | ||
647 | 428 | * Check if a Livepatch patch has been applied during boot or before | 533 | * Check if a Livepatch patch has been applied during boot or before |
648 | 429 | update-notifier has started. (LP: #1800862) | 534 | update-notifier has started. (LP: #1800862) |
649 | 430 | 535 | ||
650 | 431 | -- Andrea Azzarone <andrea.azzarone@canonical.com> Fri, 02 Nov 2018 11:34:03 +0000 | 536 | -- Andrea Azzarone <andrea.azzarone@canonical.com> Fri, 02 Nov 2018 11:34:03 +0000 |
651 | 432 | 537 | ||
652 | 538 | <<<<<<< debian/changelog | ||
653 | 433 | update-notifier (3.192.7) cosmic; urgency=medium | 539 | update-notifier (3.192.7) cosmic; urgency=medium |
654 | 434 | 540 | ||
655 | 435 | * Use absolute patch when testing if whoopsie service is enabled. | 541 | * Use absolute patch when testing if whoopsie service is enabled. |
656 | @@ -454,11 +560,30 @@ update-notifier (3.192.5) cosmic; urgency=medium | |||
657 | 454 | -- Julian Andres Klode <juliank@ubuntu.com> Tue, 29 May 2018 09:38:23 +0200 | 560 | -- Julian Andres Klode <juliank@ubuntu.com> Tue, 29 May 2018 09:38:23 +0200 |
658 | 455 | 561 | ||
659 | 456 | update-notifier (3.192.4) cosmic; urgency=medium | 562 | update-notifier (3.192.4) cosmic; urgency=medium |
660 | 563 | ======= | ||
661 | 564 | update-notifier (3.192.1.3) bionic; urgency=medium | ||
662 | 565 | |||
663 | 566 | * Use absolute patch when testing if whoopsie service is enabled. | ||
664 | 567 | (Thanks Jean-Baptiste!) | ||
665 | 568 | * Add some debug messages | ||
666 | 569 | |||
667 | 570 | -- Didier Roche <didrocks@ubuntu.com> Mon, 02 Jul 2018 11:27:13 +0200 | ||
668 | 571 | |||
669 | 572 | update-notifier (3.192.1.2) bionic; urgency=medium | ||
670 | 573 | |||
671 | 574 | * Only show apport UI if whoopsie is not in auto or never reporting mode. | ||
672 | 575 | (LP: #1778697) | ||
673 | 576 | |||
674 | 577 | -- Didier Roche <didrocks@ubuntu.com> Wed, 27 Jun 2018 10:00:08 +0200 | ||
675 | 578 | |||
676 | 579 | update-notifier (3.192.1.1) bionic; urgency=medium | ||
677 | 580 | >>>>>>> debian/changelog | ||
678 | 457 | 581 | ||
679 | 458 | * package-data-downloader: Only print processing messages if we | 582 | * package-data-downloader: Only print processing messages if we |
680 | 459 | should download stuff, or if an expected exception occured | 583 | should download stuff, or if an expected exception occured |
681 | 460 | (LP: #1641671) | 584 | (LP: #1641671) |
682 | 461 | 585 | ||
683 | 586 | <<<<<<< debian/changelog | ||
684 | 462 | -- Julian Andres Klode <juliank@ubuntu.com> Fri, 25 May 2018 18:15:22 +0200 | 587 | -- Julian Andres Klode <juliank@ubuntu.com> Fri, 25 May 2018 18:15:22 +0200 |
685 | 463 | 588 | ||
686 | 464 | update-notifier (3.192.3) cosmic; urgency=medium | 589 | update-notifier (3.192.3) cosmic; urgency=medium |
687 | @@ -475,6 +600,9 @@ update-notifier (3.192.2) cosmic; urgency=medium | |||
688 | 475 | * Bump debhelper version to 11, and do autoreconf | 600 | * Bump debhelper version to 11, and do autoreconf |
689 | 476 | 601 | ||
690 | 477 | -- Gianfranco Costamagna <locutusofborg@debian.org> Wed, 09 May 2018 10:13:54 +0200 | 602 | -- Gianfranco Costamagna <locutusofborg@debian.org> Wed, 09 May 2018 10:13:54 +0200 |
691 | 603 | ======= | ||
692 | 604 | -- Julian Andres Klode <juliank@ubuntu.com> Mon, 18 Jun 2018 16:11:40 +0200 | ||
693 | 605 | >>>>>>> debian/changelog | ||
694 | 478 | 606 | ||
695 | 479 | update-notifier (3.192.1) bionic; urgency=medium | 607 | update-notifier (3.192.1) bionic; urgency=medium |
696 | 480 | 608 | ||
697 | diff --git a/debian/compat b/debian/compat | |||
698 | index b4de394..84454a7 100644 | |||
699 | --- a/debian/compat | |||
700 | +++ b/debian/compat | |||
701 | @@ -1 +1,5 @@ | |||
702 | 1 | <<<<<<< debian/compat | ||
703 | 1 | 11 | 2 | 11 |
704 | 3 | ======= | ||
705 | 4 | 7 | ||
706 | 5 | >>>>>>> debian/compat | ||
707 | diff --git a/debian/control b/debian/control | |||
708 | index a2d5c02..4990ae1 100644 | |||
709 | --- a/debian/control | |||
710 | +++ b/debian/control | |||
711 | @@ -2,7 +2,11 @@ Source: update-notifier | |||
712 | 2 | Section: gnome | 2 | Section: gnome |
713 | 3 | Priority: optional | 3 | Priority: optional |
714 | 4 | Maintainer: Michael Vogt <michael.vogt@ubuntu.com> | 4 | Maintainer: Michael Vogt <michael.vogt@ubuntu.com> |
715 | 5 | <<<<<<< debian/control | ||
716 | 5 | Build-Depends: debhelper (>= 11~), | 6 | Build-Depends: debhelper (>= 11~), |
717 | 7 | ======= | ||
718 | 8 | Build-Depends: debhelper (>= 7.0.50~), | ||
719 | 9 | >>>>>>> debian/control | ||
720 | 6 | dh-python, | 10 | dh-python, |
721 | 7 | libgtk-3-dev, | 11 | libgtk-3-dev, |
722 | 8 | libglib2.0-dev (>= 2.34), | 12 | libglib2.0-dev (>= 2.34), |
723 | @@ -11,8 +15,14 @@ Build-Depends: debhelper (>= 11~), | |||
724 | 11 | libnotify-dev (>= 0.7), | 15 | libnotify-dev (>= 0.7), |
725 | 12 | libgudev-1.0-dev, | 16 | libgudev-1.0-dev, |
726 | 13 | libx11-dev, | 17 | libx11-dev, |
727 | 18 | <<<<<<< debian/control | ||
728 | 14 | libayatana-appindicator3-dev, | 19 | libayatana-appindicator3-dev, |
729 | 15 | lsb-release, | 20 | lsb-release, |
730 | 21 | ======= | ||
731 | 22 | autotools-dev, | ||
732 | 23 | libappindicator3-dev, | ||
733 | 24 | pep8, | ||
734 | 25 | >>>>>>> debian/control | ||
735 | 16 | po-debconf, | 26 | po-debconf, |
736 | 17 | python3, | 27 | python3, |
737 | 18 | python3-apt, | 28 | python3-apt, |
738 | @@ -20,9 +30,16 @@ Build-Depends: debhelper (>= 11~), | |||
739 | 20 | python3-debian, | 30 | python3-debian, |
740 | 21 | python3-distro-info, | 31 | python3-distro-info, |
741 | 22 | python3-mock | 32 | python3-mock |
742 | 33 | <<<<<<< debian/control | ||
743 | 23 | Standards-Version: 4.5.0 | 34 | Standards-Version: 4.5.0 |
744 | 24 | Vcs-Git: https://git.launchpad.net/update-notifier -b master | 35 | Vcs-Git: https://git.launchpad.net/update-notifier -b master |
745 | 25 | XS-Testsuite: autopkgtest | 36 | XS-Testsuite: autopkgtest |
746 | 37 | ======= | ||
747 | 38 | Standards-Version: 3.9.4 | ||
748 | 39 | Vcs-Git: https://git.launchpad.net/update-notifier -b bionic | ||
749 | 40 | XS-Testsuite: autopkgtest | ||
750 | 41 | X-Python3-Version: >= 3.2 | ||
751 | 42 | >>>>>>> debian/control | ||
752 | 26 | 43 | ||
753 | 27 | Package: update-notifier | 44 | Package: update-notifier |
754 | 28 | Architecture: any | 45 | Architecture: any |
755 | @@ -30,16 +47,27 @@ Depends: ${shlibs:Depends}, | |||
756 | 30 | ${misc:Depends}, | 47 | ${misc:Depends}, |
757 | 31 | update-notifier-common (= ${source:Version}), | 48 | update-notifier-common (= ${source:Version}), |
758 | 32 | python3-dbus, | 49 | python3-dbus, |
759 | 50 | <<<<<<< debian/control | ||
760 | 33 | ubuntu-drivers-common, | 51 | ubuntu-drivers-common, |
761 | 34 | update-manager-gnome | update-manager (>= 1:17.04.3), | 52 | update-manager-gnome | update-manager (>= 1:17.04.3), |
762 | 35 | ubuntu-release-upgrader-gtk, | 53 | ubuntu-release-upgrader-gtk, |
763 | 36 | gnome-shell <!s390x> | notification-daemon <!s390x>, | 54 | gnome-shell <!s390x> | notification-daemon <!s390x>, |
764 | 55 | ======= | ||
765 | 56 | update-manager-gnome | update-manager (>= 1:17.04.3), | ||
766 | 57 | ubuntu-release-upgrader-gtk, | ||
767 | 58 | notification-daemon, | ||
768 | 59 | >>>>>>> debian/control | ||
769 | 37 | policykit-1 | 60 | policykit-1 |
770 | 38 | Recommends: apport-gtk (>=2.8-0ubuntu3), | 61 | Recommends: apport-gtk (>=2.8-0ubuntu3), |
771 | 39 | python3-aptdaemon.gtk3widgets | synaptic (>= 0.75.12), | 62 | python3-aptdaemon.gtk3widgets | synaptic (>= 0.75.12), |
772 | 40 | software-properties-gtk, | 63 | software-properties-gtk, |
773 | 64 | <<<<<<< debian/control | ||
774 | 41 | python3-aptdaemon, | 65 | python3-aptdaemon, |
775 | 42 | whoopsie (>= 0.2.77) | 66 | whoopsie (>= 0.2.77) |
776 | 67 | ======= | ||
777 | 68 | anacron, | ||
778 | 69 | python3-aptdaemon | ||
779 | 70 | >>>>>>> debian/control | ||
780 | 43 | Description: Daemon which notifies about package updates | 71 | Description: Daemon which notifies about package updates |
781 | 44 | Puts an icon in the user's notification area when package updates are | 72 | Puts an icon in the user's notification area when package updates are |
782 | 45 | available. | 73 | available. |
783 | diff --git a/debian/rules b/debian/rules | |||
784 | index 73fe23e..e6b0cf0 100755 | |||
785 | --- a/debian/rules | |||
786 | +++ b/debian/rules | |||
787 | @@ -3,6 +3,7 @@ export CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2) | |||
788 | 3 | export LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed | 3 | export LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed |
789 | 4 | 4 | ||
790 | 5 | %: | 5 | %: |
791 | 6 | <<<<<<< debian/rules | ||
792 | 6 | dh $@ --with python3 --with autoreconf | 7 | dh $@ --with python3 --with autoreconf |
793 | 7 | 8 | ||
794 | 8 | override_dh_autoreconf: | 9 | override_dh_autoreconf: |
795 | @@ -15,3 +16,9 @@ override_dh_auto_test: | |||
796 | 15 | cd tests && python3 test_package-data-downloader.py | 16 | cd tests && python3 test_package-data-downloader.py |
797 | 16 | cd tests && python3 test_motd.py | 17 | cd tests && python3 test_motd.py |
798 | 17 | 18 | ||
799 | 19 | ======= | ||
800 | 20 | dh $@ --with python3 | ||
801 | 21 | |||
802 | 22 | override_dh_auto_test: | ||
803 | 23 | cd tests && python3 test_package-data-downloader.py | ||
804 | 24 | >>>>>>> debian/rules | ||
805 | diff --git a/debian/systemd/unicast-local-avahi.override b/debian/systemd/unicast-local-avahi.override | |||
806 | 18 | new file mode 100644 | 25 | new file mode 100644 |
807 | index 0000000..2905494 | |||
808 | --- /dev/null | |||
809 | +++ b/debian/systemd/unicast-local-avahi.override | |||
810 | @@ -0,0 +1 @@ | |||
811 | 1 | manual | ||
812 | diff --git a/debian/systemd/unicast-local-avahi.path b/debian/systemd/unicast-local-avahi.path | |||
813 | 0 | new file mode 100644 | 2 | new file mode 100644 |
814 | index 0000000..be370c4 | |||
815 | --- /dev/null | |||
816 | +++ b/debian/systemd/unicast-local-avahi.path | |||
817 | @@ -0,0 +1,6 @@ | |||
818 | 1 | [Unit] | ||
819 | 2 | Description=Path trigger for Avahi .local domain notifications | ||
820 | 3 | PartOf=graphical-session.target | ||
821 | 4 | |||
822 | 5 | [Path] | ||
823 | 6 | PathChanged=/run/avahi-daemon/disabled-for-unicast-local | ||
824 | diff --git a/debian/systemd/unicast-local-avahi.service b/debian/systemd/unicast-local-avahi.service | |||
825 | 0 | new file mode 100644 | 7 | new file mode 100644 |
826 | index 0000000..ec11a89 | |||
827 | --- /dev/null | |||
828 | +++ b/debian/systemd/unicast-local-avahi.service | |||
829 | @@ -0,0 +1,6 @@ | |||
830 | 1 | [Unit] | ||
831 | 2 | Description=Notification regarding avahi disabled due to .local domain | ||
832 | 3 | |||
833 | 4 | [Service] | ||
834 | 5 | ExecStart=/usr/lib/update-notifier/local-avahi-notification | ||
835 | 6 | Type=oneshot | ||
836 | diff --git a/debian/systemd/update-notifier-crash.path b/debian/systemd/update-notifier-crash.path | |||
837 | index 79d9160..7c83d51 100644 | |||
838 | --- a/debian/systemd/update-notifier-crash.path | |||
839 | +++ b/debian/systemd/update-notifier-crash.path | |||
840 | @@ -1,7 +1,10 @@ | |||
841 | 1 | [Unit] | 1 | [Unit] |
842 | 2 | Description=Path trigger for Apport crash notifications | 2 | Description=Path trigger for Apport crash notifications |
843 | 3 | PartOf=graphical-session.target | 3 | PartOf=graphical-session.target |
844 | 4 | <<<<<<< debian/systemd/update-notifier-crash.path | ||
845 | 4 | ConditionPathExists=!/var/lib/apport/autoreport | 5 | ConditionPathExists=!/var/lib/apport/autoreport |
846 | 6 | ======= | ||
847 | 7 | >>>>>>> debian/systemd/update-notifier-crash.path | ||
848 | 5 | 8 | ||
849 | 6 | [Path] | 9 | [Path] |
850 | 7 | PathChanged=/var/crash/ | 10 | PathChanged=/var/crash/ |
851 | diff --git a/debian/systemd/update-notifier-crash.service b/debian/systemd/update-notifier-crash.service | |||
852 | index fa6bcfa..9106394 100644 | |||
853 | --- a/debian/systemd/update-notifier-crash.service | |||
854 | +++ b/debian/systemd/update-notifier-crash.service | |||
855 | @@ -1,9 +1,15 @@ | |||
856 | 1 | [Unit] | 1 | [Unit] |
857 | 2 | Description=Notification regarding a crash report | 2 | Description=Notification regarding a crash report |
858 | 3 | PartOf=graphical-session.target | 3 | PartOf=graphical-session.target |
859 | 4 | <<<<<<< debian/systemd/update-notifier-crash.service | ||
860 | 4 | ConditionPathExists=!/var/lib/apport/autoreport | 5 | ConditionPathExists=!/var/lib/apport/autoreport |
861 | 6 | ======= | ||
862 | 7 | >>>>>>> debian/systemd/update-notifier-crash.service | ||
863 | 5 | 8 | ||
864 | 6 | [Service] | 9 | [Service] |
865 | 7 | ExecStart=/usr/lib/update-notifier/update-notifier-crash | 10 | ExecStart=/usr/lib/update-notifier/update-notifier-crash |
866 | 8 | Type=oneshot | 11 | Type=oneshot |
867 | 12 | <<<<<<< debian/systemd/update-notifier-crash.service | ||
868 | 9 | KillMode=process | 13 | KillMode=process |
869 | 14 | ======= | ||
870 | 15 | >>>>>>> debian/systemd/update-notifier-crash.service | ||
871 | diff --git a/debian/tests/control b/debian/tests/control | |||
872 | index f053df1..987f2b1 100644 | |||
873 | --- a/debian/tests/control | |||
874 | +++ b/debian/tests/control | |||
875 | @@ -1,3 +1,7 @@ | |||
876 | 1 | Tests: nose-tests | 1 | Tests: nose-tests |
877 | 2 | <<<<<<< debian/tests/control | ||
878 | 2 | Depends: @, pycodestyle, pyflakes3, python3-mock, python3-nose | 3 | Depends: @, pycodestyle, pyflakes3, python3-mock, python3-nose |
879 | 4 | ======= | ||
880 | 5 | Depends: @, pep8, pyflakes, python3-mock, python3-nose | ||
881 | 6 | >>>>>>> debian/tests/control | ||
882 | 3 | Restrictions: allow-stderr | 7 | Restrictions: allow-stderr |
883 | diff --git a/debian/unicast-local-avahi.conf b/debian/unicast-local-avahi.conf | |||
884 | 4 | new file mode 100644 | 8 | new file mode 100644 |
885 | index 0000000..69c5db0 | |||
886 | --- /dev/null | |||
887 | +++ b/debian/unicast-local-avahi.conf | |||
888 | @@ -0,0 +1,14 @@ | |||
889 | 1 | description "Notification regarding avahi disabled due to .local domain" | ||
890 | 2 | author "Brian Murray <brian@ubuntu.com>" | ||
891 | 3 | |||
892 | 4 | start on ( | ||
893 | 5 | file FILE=/run/avahi-daemon/disabled-for-unicast-local EVENT=create | ||
894 | 6 | ) | ||
895 | 7 | |||
896 | 8 | |||
897 | 9 | script | ||
898 | 10 | echo $(date) | ||
899 | 11 | echo "avahi disabled" | ||
900 | 12 | sleep 5 | ||
901 | 13 | /usr/lib/update-notifier/local-avahi-notification | ||
902 | 14 | end script | ||
903 | diff --git a/debian/update-notifier-common.cron.daily b/debian/update-notifier-common.cron.daily | |||
904 | 0 | new file mode 100644 | 15 | new file mode 100644 |
905 | index 0000000..e90d153 | |||
906 | --- /dev/null | |||
907 | +++ b/debian/update-notifier-common.cron.daily | |||
908 | @@ -0,0 +1,8 @@ | |||
909 | 1 | #!/bin/sh | ||
910 | 2 | |||
911 | 3 | set -e | ||
912 | 4 | |||
913 | 5 | [ -x /usr/lib/update-notifier/package-data-downloader ] || exit 0 | ||
914 | 6 | |||
915 | 7 | # Try to rerun any package data downloads that failed at package install time. | ||
916 | 8 | /usr/lib/update-notifier/package-data-downloader | ||
917 | diff --git a/debian/update-notifier-common.cron.weekly b/debian/update-notifier-common.cron.weekly | |||
918 | 0 | new file mode 100644 | 9 | new file mode 100644 |
919 | index 0000000..0e87107 | |||
920 | --- /dev/null | |||
921 | +++ b/debian/update-notifier-common.cron.weekly | |||
922 | @@ -0,0 +1,15 @@ | |||
923 | 1 | #!/bin/sh | ||
924 | 2 | |||
925 | 3 | set -e | ||
926 | 4 | |||
927 | 5 | [ -x /usr/lib/ubuntu-release-upgrader/release-upgrade-motd ] || exit 0 | ||
928 | 6 | |||
929 | 7 | sleep_then_check() { | ||
930 | 8 | # Sleep for up to an hour to spread the load of checking for updates on | ||
931 | 9 | # the Ubuntu infrastructure | ||
932 | 10 | sleep $(shuf -i 1-3600 -n 1) | ||
933 | 11 | # Check to see whether there is a new version of Ubuntu available | ||
934 | 12 | /usr/lib/ubuntu-release-upgrader/release-upgrade-motd | ||
935 | 13 | } | ||
936 | 14 | |||
937 | 15 | sleep_then_check & | ||
938 | diff --git a/debian/update-notifier-common.install b/debian/update-notifier-common.install | |||
939 | index 15a2ac6..5fb4de4 100644 | |||
940 | --- a/debian/update-notifier-common.install | |||
941 | +++ b/debian/update-notifier-common.install | |||
942 | @@ -8,14 +8,20 @@ debian/98-reboot-required etc/update-motd.d | |||
943 | 8 | debian/98-fsck-at-reboot etc/update-motd.d | 8 | debian/98-fsck-at-reboot etc/update-motd.d |
944 | 9 | usr/share/polkit-1/actions/com.ubuntu.update-notifier.policy | 9 | usr/share/polkit-1/actions/com.ubuntu.update-notifier.policy |
945 | 10 | usr/share/update-notifier/notify-reboot-required | 10 | usr/share/update-notifier/notify-reboot-required |
946 | 11 | <<<<<<< debian/update-notifier-common.install | ||
947 | 11 | usr/share/update-notifier/notify-updates-outdated | 12 | usr/share/update-notifier/notify-updates-outdated |
948 | 13 | ======= | ||
949 | 14 | >>>>>>> debian/update-notifier-common.install | ||
950 | 12 | usr/share/update-notifier/package-data-downloads-failed | 15 | usr/share/update-notifier/package-data-downloads-failed |
951 | 13 | usr/share/update-notifier/package-data-downloads-failed-permanently | 16 | usr/share/update-notifier/package-data-downloads-failed-permanently |
952 | 14 | usr/lib/update-notifier/ | 17 | usr/lib/update-notifier/ |
953 | 15 | usr/share/locale | 18 | usr/share/locale |
954 | 16 | debian/update-manager-downloader-fix2.diff usr/share/update-notifier/upgrader-patches | 19 | debian/update-manager-downloader-fix2.diff usr/share/update-notifier/upgrader-patches |
955 | 20 | <<<<<<< debian/update-notifier-common.install | ||
956 | 17 | # systemd timers | 21 | # systemd timers |
957 | 18 | debian/systemd/update-notifier-motd.service lib/systemd/system | 22 | debian/systemd/update-notifier-motd.service lib/systemd/system |
958 | 19 | debian/systemd/update-notifier-motd.timer lib/systemd/system | 23 | debian/systemd/update-notifier-motd.timer lib/systemd/system |
959 | 20 | debian/systemd/update-notifier-download.service lib/systemd/system | 24 | debian/systemd/update-notifier-download.service lib/systemd/system |
960 | 21 | debian/systemd/update-notifier-download.timer lib/systemd/system | 25 | debian/systemd/update-notifier-download.timer lib/systemd/system |
961 | 26 | ======= | ||
962 | 27 | >>>>>>> debian/update-notifier-common.install | ||
963 | diff --git a/debian/update-notifier-common.postinst b/debian/update-notifier-common.postinst | |||
964 | index d3789f0..f5c9efc 100644 | |||
965 | --- a/debian/update-notifier-common.postinst | |||
966 | +++ b/debian/update-notifier-common.postinst | |||
967 | @@ -28,4 +28,11 @@ chmod 700 /var/lib/update-notifier/package-data-downloads/partial/ | |||
968 | 28 | # depending on package unpack order. | 28 | # depending on package unpack order. |
969 | 29 | /usr/lib/update-notifier/package-data-downloader | 29 | /usr/lib/update-notifier/package-data-downloader |
970 | 30 | 30 | ||
971 | 31 | <<<<<<< debian/update-notifier-common.postinst | ||
972 | 32 | ======= | ||
973 | 33 | # Remove update-motd cpu-checker script | ||
974 | 34 | dpkg-maintscript-helper rm_conffile /etc/update-motd.d/20-cpu-checker \ | ||
975 | 35 | 0.110.1ubuntu1 -- "$@" | ||
976 | 36 | |||
977 | 37 | >>>>>>> debian/update-notifier-common.postinst | ||
978 | 31 | #DEBHELPER# | 38 | #DEBHELPER# |
979 | diff --git a/debian/update-notifier-common.postrm b/debian/update-notifier-common.postrm | |||
980 | 32 | new file mode 100644 | 39 | new file mode 100644 |
981 | index 0000000..a4e0c0b | |||
982 | --- /dev/null | |||
983 | +++ b/debian/update-notifier-common.postrm | |||
984 | @@ -0,0 +1,8 @@ | |||
985 | 1 | #!/bin/sh | ||
986 | 2 | |||
987 | 3 | set -e | ||
988 | 4 | |||
989 | 5 | dpkg-maintscript-helper rm_conffile /etc/update-motd.d/20-cpu-checker \ | ||
990 | 6 | 0.110.1ubuntu1 -- "$@" | ||
991 | 7 | |||
992 | 8 | #DEBHELPER# | ||
993 | diff --git a/debian/update-notifier-common.preinst b/debian/update-notifier-common.preinst | |||
994 | 0 | new file mode 100644 | 9 | new file mode 100644 |
995 | index 0000000..a4e0c0b | |||
996 | --- /dev/null | |||
997 | +++ b/debian/update-notifier-common.preinst | |||
998 | @@ -0,0 +1,8 @@ | |||
999 | 1 | #!/bin/sh | ||
1000 | 2 | |||
1001 | 3 | set -e | ||
1002 | 4 | |||
1003 | 5 | dpkg-maintscript-helper rm_conffile /etc/update-motd.d/20-cpu-checker \ | ||
1004 | 6 | 0.110.1ubuntu1 -- "$@" | ||
1005 | 7 | |||
1006 | 8 | #DEBHELPER# | ||
1007 | diff --git a/debian/update-notifier-common.triggers b/debian/update-notifier-common.triggers | |||
1008 | index c6c76fa..e2d0659 100644 | |||
1009 | --- a/debian/update-notifier-common.triggers | |||
1010 | +++ b/debian/update-notifier-common.triggers | |||
1011 | @@ -1 +1,5 @@ | |||
1012 | 1 | <<<<<<< debian/update-notifier-common.triggers | ||
1013 | 1 | interest-noawait /usr/share/package-data-downloads | 2 | interest-noawait /usr/share/package-data-downloads |
1014 | 3 | ======= | ||
1015 | 4 | interest /usr/share/package-data-downloads | ||
1016 | 5 | >>>>>>> debian/update-notifier-common.triggers | ||
1017 | diff --git a/debian/update-notifier-crash b/debian/update-notifier-crash | |||
1018 | index 089f503..366abfc 100755 | |||
1019 | --- a/debian/update-notifier-crash | |||
1020 | +++ b/debian/update-notifier-crash | |||
1021 | @@ -1,6 +1,7 @@ | |||
1022 | 1 | #!/bin/sh | 1 | #!/bin/sh |
1023 | 2 | set -e | 2 | set -e |
1024 | 3 | 3 | ||
1025 | 4 | <<<<<<< debian/update-notifier-crash | ||
1026 | 4 | # if whoopsie in never report mode, don't show anything. | 5 | # if whoopsie in never report mode, don't show anything. |
1027 | 5 | which whoopsie | 6 | which whoopsie |
1028 | 6 | has_whoopsie=$? | 7 | has_whoopsie=$? |
1029 | @@ -10,6 +11,8 @@ if [ $has_whoopsie -eq 0 -a $whoopsie_enabled -ne 0 ]; then | |||
1030 | 10 | exit 0 | 11 | exit 0 |
1031 | 11 | fi | 12 | fi |
1032 | 12 | 13 | ||
1033 | 14 | ======= | ||
1034 | 15 | >>>>>>> debian/update-notifier-crash | ||
1035 | 13 | if /usr/share/apport/apport-checkreports; then | 16 | if /usr/share/apport/apport-checkreports; then |
1036 | 14 | /usr/share/apport/apport-gtk | 17 | /usr/share/apport/apport-gtk |
1037 | 15 | else | 18 | else |
1038 | diff --git a/debian/update-notifier.install b/debian/update-notifier.install | |||
1039 | index 26fdef3..0766cae 100644 | |||
1040 | --- a/debian/update-notifier.install | |||
1041 | +++ b/debian/update-notifier.install | |||
1042 | @@ -1,5 +1,8 @@ | |||
1043 | 1 | etc/xdg/autostart/update-notifier.desktop | 1 | etc/xdg/autostart/update-notifier.desktop |
1044 | 2 | <<<<<<< debian/update-notifier.install | ||
1045 | 2 | etc/xdg/autostart/ubuntu-advantage-notification.desktop | 3 | etc/xdg/autostart/ubuntu-advantage-notification.desktop |
1046 | 4 | ======= | ||
1047 | 5 | >>>>>>> debian/update-notifier.install | ||
1048 | 3 | usr/share/update-notifier/ui/hooks-dialog.ui | 6 | usr/share/update-notifier/ui/hooks-dialog.ui |
1049 | 4 | usr/share/icons/hicolor/16x16/ | 7 | usr/share/icons/hicolor/16x16/ |
1050 | 5 | usr/share/icons/hicolor/22x22/ | 8 | usr/share/icons/hicolor/22x22/ |
1051 | @@ -10,22 +13,40 @@ usr/share/glib-2.0/schemas/com.ubuntu.update-notifier.gschema.xml | |||
1052 | 10 | usr/bin/update-notifier | 13 | usr/bin/update-notifier |
1053 | 11 | usr/bin/distro-cd-updater usr/lib/update-notifier/ | 14 | usr/bin/distro-cd-updater usr/lib/update-notifier/ |
1054 | 12 | usr/bin/livepatch-notification usr/lib/update-notifier/ | 15 | usr/bin/livepatch-notification usr/lib/update-notifier/ |
1055 | 16 | <<<<<<< debian/update-notifier.install | ||
1056 | 13 | usr/bin/system-crash-notification usr/lib/update-notifier/ | 17 | usr/bin/system-crash-notification usr/lib/update-notifier/ |
1057 | 14 | usr/bin/ubuntu-advantage-notification usr/lib/update-notifier/ | 18 | usr/bin/ubuntu-advantage-notification usr/lib/update-notifier/ |
1058 | 15 | # upstart jobs | 19 | # upstart jobs |
1059 | 16 | debian/update-notifier-cds.conf usr/share/upstart/sessions/ | 20 | debian/update-notifier-cds.conf usr/share/upstart/sessions/ |
1060 | 17 | debian/update-notifier-hp-firmware.conf usr/share/upstart/sessions/ | 21 | debian/update-notifier-hp-firmware.conf usr/share/upstart/sessions/ |
1061 | 22 | ======= | ||
1062 | 23 | usr/bin/local-avahi-notification usr/lib/update-notifier/ | ||
1063 | 24 | usr/bin/system-crash-notification usr/lib/update-notifier/ | ||
1064 | 25 | # upstart jobs | ||
1065 | 26 | debian/update-notifier-cds.conf usr/share/upstart/sessions/ | ||
1066 | 27 | debian/update-notifier-hp-firmware.conf usr/share/upstart/sessions/ | ||
1067 | 28 | debian/unicast-local-avahi.conf usr/share/upstart/sessions/ | ||
1068 | 29 | >>>>>>> debian/update-notifier.install | ||
1069 | 18 | debian/update-notifier-release.conf usr/share/upstart/sessions/ | 30 | debian/update-notifier-release.conf usr/share/upstart/sessions/ |
1070 | 19 | debian/update-notifier-crash.conf usr/share/upstart/sessions/ | 31 | debian/update-notifier-crash.conf usr/share/upstart/sessions/ |
1071 | 20 | #systemd units | 32 | #systemd units |
1072 | 21 | debian/systemd/update-notifier-crash.path usr/lib/systemd/user | 33 | debian/systemd/update-notifier-crash.path usr/lib/systemd/user |
1073 | 22 | debian/systemd/update-notifier-crash.service usr/lib/systemd/user | 34 | debian/systemd/update-notifier-crash.service usr/lib/systemd/user |
1074 | 23 | debian/update-notifier-crash usr/lib/update-notifier/ | 35 | debian/update-notifier-crash usr/lib/update-notifier/ |
1075 | 36 | <<<<<<< debian/update-notifier.install | ||
1076 | 37 | ======= | ||
1077 | 38 | debian/systemd/unicast-local-avahi.path usr/lib/systemd/user | ||
1078 | 39 | debian/systemd/unicast-local-avahi.service usr/lib/systemd/user | ||
1079 | 40 | >>>>>>> debian/update-notifier.install | ||
1080 | 24 | debian/systemd/update-notifier-release.path usr/lib/systemd/user | 41 | debian/systemd/update-notifier-release.path usr/lib/systemd/user |
1081 | 25 | debian/systemd/update-notifier-release.service usr/lib/systemd/user | 42 | debian/systemd/update-notifier-release.service usr/lib/systemd/user |
1082 | 26 | debian/systemd/update-notifier-livepatch.path usr/lib/systemd/user | 43 | debian/systemd/update-notifier-livepatch.path usr/lib/systemd/user |
1083 | 27 | debian/systemd/update-notifier-livepatch.service usr/lib/systemd/user | 44 | debian/systemd/update-notifier-livepatch.service usr/lib/systemd/user |
1084 | 28 | # disable upstart job under systemd sessions | 45 | # disable upstart job under systemd sessions |
1085 | 46 | <<<<<<< debian/update-notifier.install | ||
1086 | 47 | ======= | ||
1087 | 48 | debian/systemd/unicast-local-avahi.override usr/share/upstart/systemd-session/upstart/ | ||
1088 | 49 | >>>>>>> debian/update-notifier.install | ||
1089 | 29 | debian/systemd/update-notifier-crash.override usr/share/upstart/systemd-session/upstart/ | 50 | debian/systemd/update-notifier-crash.override usr/share/upstart/systemd-session/upstart/ |
1090 | 30 | debian/systemd/update-notifier-hp-firmware.override usr/share/upstart/systemd-session/upstart/ | 51 | debian/systemd/update-notifier-hp-firmware.override usr/share/upstart/systemd-session/upstart/ |
1091 | 31 | debian/systemd/update-notifier-release.override usr/share/upstart/systemd-session/upstart/ | 52 | debian/systemd/update-notifier-release.override usr/share/upstart/systemd-session/upstart/ |
1092 | diff --git a/debian/update-notifier.links b/debian/update-notifier.links | |||
1093 | index 3cf7f20..c9166ec 100644 | |||
1094 | --- a/debian/update-notifier.links | |||
1095 | +++ b/debian/update-notifier.links | |||
1096 | @@ -1,2 +1,6 @@ | |||
1097 | 1 | usr/lib/systemd/user/update-notifier-crash.path usr/lib/systemd/user/graphical-session.target.wants/update-notifier-crash.path | 1 | usr/lib/systemd/user/update-notifier-crash.path usr/lib/systemd/user/graphical-session.target.wants/update-notifier-crash.path |
1098 | 2 | <<<<<<< debian/update-notifier.links | ||
1099 | 3 | ======= | ||
1100 | 4 | usr/lib/systemd/user/unicast-local-avahi.path usr/lib/systemd/user/graphical-session.target.wants/unicast-local-avahi.path | ||
1101 | 5 | >>>>>>> debian/update-notifier.links | ||
1102 | 2 | usr/lib/systemd/user/update-notifier-release.path usr/lib/systemd/user/graphical-session.target.wants/update-notifier-release.path | 6 | usr/lib/systemd/user/update-notifier-release.path usr/lib/systemd/user/graphical-session.target.wants/update-notifier-release.path |
1103 | diff --git a/pixmaps/scalable/livepatch-on.svg b/pixmaps/scalable/livepatch-on.svg | |||
1104 | 3 | new file mode 100644 | 7 | new file mode 100644 |
1105 | index 0000000..b45b682 | |||
1106 | --- /dev/null | |||
1107 | +++ b/pixmaps/scalable/livepatch-on.svg | |||
1108 | @@ -0,0 +1 @@ | |||
1109 | 1 | <svg id="livepatch_-_on" data-name="livepatch - on" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19"><defs><style>.cls-1{fill:none;}.cls-2{fill:#ccc;}.cls-3{fill:#38b44a;}.cls-4{fill:#fff;}</style></defs><title>Artboard 1</title><g id="layer1"><rect id="rect4782" class="cls-1" y="0.13" width="19" height="19"/><path id="path4210" class="cls-2" d="M9.5.52S7.56,3.77,2.38,3.77c0,11.06,7.12,15,7.12,15s7.13-3.9,7.13-15C11.46,3.77,9.5.52,9.5.52Z"/></g><path id="path4155" class="cls-3" d="M13.56,7.59A4.4,4.4,0,1,0,18,12,4.4,4.4,0,0,0,13.56,7.59Z"/><path id="path4041-9" class="cls-4" d="M16,10.12l-2.8,2.46L11.57,11.2l-.3.33,1.92,2,3-3.18Z"/></svg> | ||
1110 | 0 | \ No newline at end of file | 2 | \ No newline at end of file |
1111 | diff --git a/pixmaps/scalable/livepatch-warning.svg b/pixmaps/scalable/livepatch-warning.svg | |||
1112 | 1 | new file mode 100644 | 3 | new file mode 100644 |
1113 | index 0000000..aff7348 | |||
1114 | --- /dev/null | |||
1115 | +++ b/pixmaps/scalable/livepatch-warning.svg | |||
1116 | @@ -0,0 +1 @@ | |||
1117 | 1 | <svg id="livepatch-_warning" data-name="livepatch- warning" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 19"><defs><style>.cls-1{fill:none;}.cls-2{fill:#ccc;}.cls-3{fill:#e95420;}.cls-4{fill:#fff;}</style></defs><title>Artboard 1</title><g id="layer1"><rect id="rect4782" class="cls-1" x="-0.03" y="0.09" width="19.07" height="19.07"/><path id="path4210" class="cls-2" d="M9.5.49S7.56,3.75,2.35,3.75c0,11.1,7.15,15,7.15,15s7.16-3.91,7.16-15C11.47,3.75,9.5.49,9.5.49Z"/></g><path id="path4155" class="cls-3" d="M13.56,7.59A4.4,4.4,0,1,0,18,12,4.4,4.4,0,0,0,13.56,7.59Z"/><path id="path4159" class="cls-4" d="M13.06,9.07v.84c0,.54,0,1.05,0,1.51s.07.91.12,1.38h.67q.07-.71.12-1.38c0-.46,0-1,0-1.51V9.07Zm.5,4.84a.63.63,0,0,0-.44.19.57.57,0,0,0-.18.44.61.61,0,0,0,.18.45.66.66,0,0,0,.44.17A.64.64,0,0,0,14,15a.61.61,0,0,0,.18-.45A.57.57,0,0,0,14,14.1.62.62,0,0,0,13.56,13.91Z"/></svg> | ||
1118 | 0 | \ No newline at end of file | 2 | \ No newline at end of file |
1119 | diff --git a/po/POTFILES.in b/po/POTFILES.in | |||
1120 | index 8c031ac..ebcbac1 100644 | |||
1121 | --- a/po/POTFILES.in | |||
1122 | +++ b/po/POTFILES.in | |||
1123 | @@ -3,11 +3,18 @@ | |||
1124 | 3 | # *grumpf* [type=] does not work because intltool-update does not | 3 | # *grumpf* [type=] does not work because intltool-update does not |
1125 | 4 | # know about anything but the types available in intltool-extract --help | 4 | # know about anything but the types available in intltool-extract --help |
1126 | 5 | [type=gettext/Shell] data/notify-reboot-required | 5 | [type=gettext/Shell] data/notify-reboot-required |
1127 | 6 | <<<<<<< po/POTFILES.in | ||
1128 | 6 | [type=gettext/Shell] data/notify-updates-outdated | 7 | [type=gettext/Shell] data/notify-updates-outdated |
1129 | 8 | ======= | ||
1130 | 9 | >>>>>>> po/POTFILES.in | ||
1131 | 7 | data/apt_check.py | 10 | data/apt_check.py |
1132 | 8 | data/apt-cdrom-check | 11 | data/apt-cdrom-check |
1133 | 9 | data/cddistupgrader | 12 | data/cddistupgrader |
1134 | 10 | src/crash.c | 13 | src/crash.c |
1135 | 14 | <<<<<<< po/POTFILES.in | ||
1136 | 15 | ======= | ||
1137 | 16 | src/avahi.c | ||
1138 | 17 | >>>>>>> po/POTFILES.in | ||
1139 | 11 | src/cdroms.c | 18 | src/cdroms.c |
1140 | 12 | src/hooks.c | 19 | src/hooks.c |
1141 | 13 | src/livepatch.c | 20 | src/livepatch.c |
1142 | @@ -18,6 +25,9 @@ src/update-notifier.c | |||
1143 | 18 | data/com.ubuntu.update-notifier.gschema.xml.in | 25 | data/com.ubuntu.update-notifier.gschema.xml.in |
1144 | 19 | data/com.ubuntu.update-notifier.policy.in | 26 | data/com.ubuntu.update-notifier.policy.in |
1145 | 20 | data/update-notifier.desktop.in | 27 | data/update-notifier.desktop.in |
1146 | 28 | <<<<<<< po/POTFILES.in | ||
1147 | 21 | data/ubuntu-advantage-notification.desktop.in | 29 | data/ubuntu-advantage-notification.desktop.in |
1148 | 30 | ======= | ||
1149 | 31 | >>>>>>> po/POTFILES.in | ||
1150 | 22 | [type: gettext/rfc822deb] data/package-data-downloads-failed.in | 32 | [type: gettext/rfc822deb] data/package-data-downloads-failed.in |
1151 | 23 | [type: gettext/rfc822deb] data/package-data-downloads-failed-permanently.in | 33 | [type: gettext/rfc822deb] data/package-data-downloads-failed-permanently.in |
1152 | diff --git a/po/ace.po b/po/ace.po | |||
1153 | index 66df2d9..6dfbdd7 100644 | |||
1154 | --- a/po/ace.po | |||
1155 | +++ b/po/ace.po | |||
1156 | @@ -7,7 +7,11 @@ msgid "" | |||
1157 | 7 | msgstr "" | 7 | msgstr "" |
1158 | 8 | "Project-Id-Version: update-notifier\n" | 8 | "Project-Id-Version: update-notifier\n" |
1159 | 9 | "Report-Msgid-Bugs-To: \n" | 9 | "Report-Msgid-Bugs-To: \n" |
1160 | 10 | <<<<<<< po/ace.po | ||
1161 | 10 | "POT-Creation-Date: 2020-11-12 23:53+0000\n" | 11 | "POT-Creation-Date: 2020-11-12 23:53+0000\n" |
1162 | 12 | ======= | ||
1163 | 13 | "POT-Creation-Date: 2020-11-19 05:20+0000\n" | ||
1164 | 14 | >>>>>>> po/ace.po | ||
1165 | 11 | "PO-Revision-Date: 2009-06-02 16:12+0000\n" | 15 | "PO-Revision-Date: 2009-06-02 16:12+0000\n" |
1166 | 12 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 16 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
1167 | 13 | "Language-Team: Achinese <ace@li.org>\n" | 17 | "Language-Team: Achinese <ace@li.org>\n" |
1168 | @@ -34,36 +38,58 @@ msgstr "" | |||
1169 | 34 | 38 | ||
1170 | 35 | #: ../data/apt_check.py:93 | 39 | #: ../data/apt_check.py:93 |
1171 | 36 | #, python-format | 40 | #, python-format |
1172 | 41 | <<<<<<< po/ace.po | ||
1173 | 37 | msgid "%i update can be installed immediately." | 42 | msgid "%i update can be installed immediately." |
1174 | 38 | msgid_plural "%i updates can be installed immediately." | 43 | msgid_plural "%i updates can be installed immediately." |
1175 | 39 | msgstr[0] "" | 44 | msgstr[0] "" |
1176 | 40 | msgstr[1] "" | 45 | msgstr[1] "" |
1177 | 41 | 46 | ||
1178 | 42 | #: ../data/apt_check.py:101 | 47 | #: ../data/apt_check.py:101 |
1179 | 48 | ======= | ||
1180 | 49 | msgid "%i package can be updated." | ||
1181 | 50 | msgid_plural "%i packages can be updated." | ||
1182 | 51 | msgstr[0] "" | ||
1183 | 52 | msgstr[1] "" | ||
1184 | 53 | |||
1185 | 54 | #: ../data/apt_check.py:99 | ||
1186 | 55 | >>>>>>> po/ace.po | ||
1187 | 43 | #, python-format | 56 | #, python-format |
1188 | 44 | msgid "%i of these updates is fixed through UA Infra: ESM." | 57 | msgid "%i of these updates is fixed through UA Infra: ESM." |
1189 | 45 | msgid_plural "%i of these updates are fixed through UA Infra: ESM." | 58 | msgid_plural "%i of these updates are fixed through UA Infra: ESM." |
1190 | 46 | msgstr[0] "" | 59 | msgstr[0] "" |
1191 | 47 | msgstr[1] "" | 60 | msgstr[1] "" |
1192 | 48 | 61 | ||
1193 | 62 | <<<<<<< po/ace.po | ||
1194 | 49 | #: ../data/apt_check.py:110 | 63 | #: ../data/apt_check.py:110 |
1195 | 64 | ======= | ||
1196 | 65 | #: ../data/apt_check.py:108 | ||
1197 | 66 | >>>>>>> po/ace.po | ||
1198 | 50 | #, python-format | 67 | #, python-format |
1199 | 51 | msgid "%i of these updates is a security update." | 68 | msgid "%i of these updates is a security update." |
1200 | 52 | msgid_plural "%i of these updates are security updates." | 69 | msgid_plural "%i of these updates are security updates." |
1201 | 53 | msgstr[0] "" | 70 | msgstr[0] "" |
1202 | 54 | msgstr[1] "" | 71 | msgstr[1] "" |
1203 | 55 | 72 | ||
1204 | 73 | <<<<<<< po/ace.po | ||
1205 | 56 | #: ../data/apt_check.py:119 | 74 | #: ../data/apt_check.py:119 |
1206 | 57 | msgid "To see these additional updates run: apt list --upgradable" | 75 | msgid "To see these additional updates run: apt list --upgradable" |
1207 | 58 | msgstr "" | 76 | msgstr "" |
1208 | 59 | 77 | ||
1209 | 60 | #: ../data/apt_check.py:126 | 78 | #: ../data/apt_check.py:126 |
1210 | 79 | ======= | ||
1211 | 80 | #: ../data/apt_check.py:117 | ||
1212 | 81 | msgid "To see these additional updates run: apt list --upgradable" | ||
1213 | 82 | msgstr "" | ||
1214 | 83 | |||
1215 | 84 | #: ../data/apt_check.py:124 | ||
1216 | 85 | >>>>>>> po/ace.po | ||
1217 | 61 | #, python-format | 86 | #, python-format |
1218 | 62 | msgid "Enable UA Infra: ESM to receive %i additional security update." | 87 | msgid "Enable UA Infra: ESM to receive %i additional security update." |
1219 | 63 | msgid_plural "Enable UA Infra: ESM to receive %i additional security updates." | 88 | msgid_plural "Enable UA Infra: ESM to receive %i additional security updates." |
1220 | 64 | msgstr[0] "" | 89 | msgstr[0] "" |
1221 | 65 | msgstr[1] "" | 90 | msgstr[1] "" |
1222 | 66 | 91 | ||
1223 | 92 | <<<<<<< po/ace.po | ||
1224 | 67 | #: ../data/apt_check.py:137 | 93 | #: ../data/apt_check.py:137 |
1225 | 68 | msgid "Enable UA Infra: ESM to receive additional future security updates." | 94 | msgid "Enable UA Infra: ESM to receive additional future security updates." |
1226 | 69 | msgstr "" | 95 | msgstr "" |
1227 | @@ -73,19 +99,39 @@ msgid "See https://ubuntu.com/security/esm or run: sudo ua status" | |||
1228 | 73 | msgstr "" | 99 | msgstr "" |
1229 | 74 | 100 | ||
1230 | 75 | #: ../data/apt_check.py:184 | 101 | #: ../data/apt_check.py:184 |
1231 | 102 | ======= | ||
1232 | 103 | #: ../data/apt_check.py:135 | ||
1233 | 104 | msgid "Enable UA Infra: ESM to receive additional future security updates." | ||
1234 | 105 | msgstr "" | ||
1235 | 106 | |||
1236 | 107 | #: ../data/apt_check.py:140 | ||
1237 | 108 | msgid "See https://ubuntu.com/security/esm or run: sudo ua status" | ||
1238 | 109 | msgstr "" | ||
1239 | 110 | |||
1240 | 111 | #: ../data/apt_check.py:182 | ||
1241 | 112 | >>>>>>> po/ace.po | ||
1242 | 76 | #, python-format | 113 | #, python-format |
1243 | 77 | msgid "Error: Opening the cache (%s)" | 114 | msgid "Error: Opening the cache (%s)" |
1244 | 78 | msgstr "" | 115 | msgstr "" |
1245 | 79 | 116 | ||
1246 | 117 | <<<<<<< po/ace.po | ||
1247 | 80 | #: ../data/apt_check.py:194 | 118 | #: ../data/apt_check.py:194 |
1248 | 81 | msgid "Error: BrokenCount > 0" | 119 | msgid "Error: BrokenCount > 0" |
1249 | 82 | msgstr "" | 120 | msgstr "" |
1250 | 83 | 121 | ||
1251 | 84 | #: ../data/apt_check.py:201 | 122 | #: ../data/apt_check.py:201 |
1252 | 123 | ======= | ||
1253 | 124 | #: ../data/apt_check.py:192 | ||
1254 | 125 | msgid "Error: BrokenCount > 0" | ||
1255 | 126 | msgstr "" | ||
1256 | 127 | |||
1257 | 128 | #: ../data/apt_check.py:199 | ||
1258 | 129 | >>>>>>> po/ace.po | ||
1259 | 85 | #, python-format | 130 | #, python-format |
1260 | 86 | msgid "Error: Marking the upgrade (%s)" | 131 | msgid "Error: Marking the upgrade (%s)" |
1261 | 87 | msgstr "" | 132 | msgstr "" |
1262 | 88 | 133 | ||
1263 | 134 | <<<<<<< po/ace.po | ||
1264 | 89 | #: ../data/apt_check.py:310 | 135 | #: ../data/apt_check.py:310 |
1265 | 90 | msgid "Show the packages that are going to be installed/upgraded" | 136 | msgid "Show the packages that are going to be installed/upgraded" |
1266 | 91 | msgstr "" | 137 | msgstr "" |
1267 | @@ -95,6 +141,17 @@ msgid "Show human readable output on stdout" | |||
1268 | 95 | msgstr "" | 141 | msgstr "" |
1269 | 96 | 142 | ||
1270 | 97 | #: ../data/apt_check.py:320 | 143 | #: ../data/apt_check.py:320 |
1271 | 144 | ======= | ||
1272 | 145 | #: ../data/apt_check.py:309 | ||
1273 | 146 | msgid "Show the packages that are going to be installed/upgraded" | ||
1274 | 147 | msgstr "" | ||
1275 | 148 | |||
1276 | 149 | #: ../data/apt_check.py:315 | ||
1277 | 150 | msgid "Show human readable output on stdout" | ||
1278 | 151 | msgstr "" | ||
1279 | 152 | |||
1280 | 153 | #: ../data/apt_check.py:319 | ||
1281 | 154 | >>>>>>> po/ace.po | ||
1282 | 98 | msgid "" | 155 | msgid "" |
1283 | 99 | "Return the time in days when security updates are installed unattended (0 " | 156 | "Return the time in days when security updates are installed unattended (0 " |
1284 | 100 | "means disabled)" | 157 | "means disabled)" |
1285 | @@ -122,6 +179,21 @@ msgid "" | |||
1286 | 122 | "notification icon to display details. " | 179 | "notification icon to display details. " |
1287 | 123 | msgstr "" | 180 | msgstr "" |
1288 | 124 | 181 | ||
1289 | 182 | <<<<<<< po/ace.po | ||
1290 | 183 | ======= | ||
1291 | 184 | #. Create and show the notification | ||
1292 | 185 | #: ../src/avahi.c:16 | ||
1293 | 186 | msgid "Network service discovery disabled" | ||
1294 | 187 | msgstr "" | ||
1295 | 188 | |||
1296 | 189 | #: ../src/avahi.c:17 | ||
1297 | 190 | msgid "" | ||
1298 | 191 | "Your current network has a .local domain, which is not recommended and " | ||
1299 | 192 | "incompatible with the Avahi network service discovery. The service has been " | ||
1300 | 193 | "disabled." | ||
1301 | 194 | msgstr "" | ||
1302 | 195 | |||
1303 | 196 | >>>>>>> po/ace.po | ||
1304 | 125 | #: ../src/cdroms.c:48 | 197 | #: ../src/cdroms.c:48 |
1305 | 126 | msgid "Software Packages Volume Detected" | 198 | msgid "Software Packages Volume Detected" |
1306 | 127 | msgstr "" | 199 | msgstr "" |
1307 | @@ -203,9 +275,14 @@ msgid "No current updates" | |||
1308 | 203 | msgstr "" | 275 | msgstr "" |
1309 | 204 | 276 | ||
1310 | 205 | #: ../src/livepatch-tray.c:148 | 277 | #: ../src/livepatch-tray.c:148 |
1311 | 278 | <<<<<<< po/ace.po | ||
1312 | 206 | #, c-format | 279 | #, c-format |
1313 | 207 | msgid "%zd current update" | 280 | msgid "%zd current update" |
1314 | 208 | msgid_plural "%zd current updates" | 281 | msgid_plural "%zd current updates" |
1315 | 282 | ======= | ||
1316 | 283 | msgid "%" | ||
1317 | 284 | msgid_plural "%" | ||
1318 | 285 | >>>>>>> po/ace.po | ||
1319 | 209 | msgstr[0] "" | 286 | msgstr[0] "" |
1320 | 210 | msgstr[1] "" | 287 | msgstr[1] "" |
1321 | 211 | 288 | ||
1322 | @@ -290,20 +367,36 @@ msgstr "" | |||
1323 | 290 | msgid "A problem occurred when checking for the updates." | 367 | msgid "A problem occurred when checking for the updates." |
1324 | 291 | msgstr "" | 368 | msgstr "" |
1325 | 292 | 369 | ||
1326 | 370 | <<<<<<< po/ace.po | ||
1327 | 293 | #: ../src/update-notifier.c:560 | 371 | #: ../src/update-notifier.c:560 |
1328 | 294 | msgid "- inform about updates" | 372 | msgid "- inform about updates" |
1329 | 295 | msgstr "" | 373 | msgstr "" |
1330 | 296 | 374 | ||
1331 | 297 | #: ../src/update-notifier.c:562 | 375 | #: ../src/update-notifier.c:562 |
1332 | 376 | ======= | ||
1333 | 377 | #: ../src/update-notifier.c:585 | ||
1334 | 378 | msgid "- inform about updates" | ||
1335 | 379 | msgstr "" | ||
1336 | 380 | |||
1337 | 381 | #: ../src/update-notifier.c:587 | ||
1338 | 382 | >>>>>>> po/ace.po | ||
1339 | 298 | #, c-format | 383 | #, c-format |
1340 | 299 | msgid "Failed to init the UI: %s\n" | 384 | msgid "Failed to init the UI: %s\n" |
1341 | 300 | msgstr "" | 385 | msgstr "" |
1342 | 301 | 386 | ||
1343 | 387 | <<<<<<< po/ace.po | ||
1344 | 302 | #: ../src/update-notifier.c:563 | 388 | #: ../src/update-notifier.c:563 |
1345 | 303 | msgid "unknown error" | 389 | msgid "unknown error" |
1346 | 304 | msgstr "" | 390 | msgstr "" |
1347 | 305 | 391 | ||
1348 | 306 | #: ../src/update-notifier.c:590 | 392 | #: ../src/update-notifier.c:590 |
1349 | 393 | ======= | ||
1350 | 394 | #: ../src/update-notifier.c:588 | ||
1351 | 395 | msgid "unknown error" | ||
1352 | 396 | msgstr "" | ||
1353 | 397 | |||
1354 | 398 | #: ../src/update-notifier.c:615 | ||
1355 | 399 | >>>>>>> po/ace.po | ||
1356 | 307 | msgid "update-notifier" | 400 | msgid "update-notifier" |
1357 | 308 | msgstr "" | 401 | msgstr "" |
1358 | 309 | 402 | ||
1359 | diff --git a/po/af.po b/po/af.po | |||
1360 | index b89dc92..752e8b5 100644 | |||
1361 | --- a/po/af.po | |||
1362 | +++ b/po/af.po | |||
1363 | @@ -7,7 +7,11 @@ msgid "" | |||
1364 | 7 | msgstr "" | 7 | msgstr "" |
1365 | 8 | "Project-Id-Version: update-notifier\n" | 8 | "Project-Id-Version: update-notifier\n" |
1366 | 9 | "Report-Msgid-Bugs-To: \n" | 9 | "Report-Msgid-Bugs-To: \n" |
1367 | 10 | <<<<<<< po/af.po | ||
1368 | 10 | "POT-Creation-Date: 2020-11-12 23:53+0000\n" | 11 | "POT-Creation-Date: 2020-11-12 23:53+0000\n" |
1369 | 12 | ======= | ||
1370 | 13 | "POT-Creation-Date: 2020-11-19 05:20+0000\n" | ||
1371 | 14 | >>>>>>> po/af.po | ||
1372 | 11 | "PO-Revision-Date: 2012-09-06 08:22+0000\n" | 15 | "PO-Revision-Date: 2012-09-06 08:22+0000\n" |
1373 | 12 | "Last-Translator: Dawid de Jager <dawid.dejager@gmail.com>\n" | 16 | "Last-Translator: Dawid de Jager <dawid.dejager@gmail.com>\n" |
1374 | 13 | "Language-Team: Afrikaans <af@li.org>\n" | 17 | "Language-Team: Afrikaans <af@li.org>\n" |
1375 | @@ -33,6 +37,7 @@ msgid "UA Infra: Extended Security Maintenance (ESM) is not enabled." | |||
1376 | 33 | msgstr "" | 37 | msgstr "" |
1377 | 34 | 38 | ||
1378 | 35 | #: ../data/apt_check.py:93 | 39 | #: ../data/apt_check.py:93 |
1379 | 40 | <<<<<<< po/af.po | ||
1380 | 36 | #, fuzzy, python-format | 41 | #, fuzzy, python-format |
1381 | 37 | msgid "%i update can be installed immediately." | 42 | msgid "%i update can be installed immediately." |
1382 | 38 | msgid_plural "%i updates can be installed immediately." | 43 | msgid_plural "%i updates can be installed immediately." |
1383 | @@ -40,30 +45,52 @@ msgstr[0] "%i bywerking is 'n veiligheidsopdatering." | |||
1384 | 40 | msgstr[1] "%i bywerkings is veiligheidsopdaterings." | 45 | msgstr[1] "%i bywerkings is veiligheidsopdaterings." |
1385 | 41 | 46 | ||
1386 | 42 | #: ../data/apt_check.py:101 | 47 | #: ../data/apt_check.py:101 |
1387 | 48 | ======= | ||
1388 | 49 | #, python-format | ||
1389 | 50 | msgid "%i package can be updated." | ||
1390 | 51 | msgid_plural "%i packages can be updated." | ||
1391 | 52 | msgstr[0] "Daar kan %i pakket opgedateer word" | ||
1392 | 53 | msgstr[1] "Daar kan %i pakkette opgedateer word" | ||
1393 | 54 | |||
1394 | 55 | #: ../data/apt_check.py:99 | ||
1395 | 56 | >>>>>>> po/af.po | ||
1396 | 43 | #, python-format | 57 | #, python-format |
1397 | 44 | msgid "%i of these updates is fixed through UA Infra: ESM." | 58 | msgid "%i of these updates is fixed through UA Infra: ESM." |
1398 | 45 | msgid_plural "%i of these updates are fixed through UA Infra: ESM." | 59 | msgid_plural "%i of these updates are fixed through UA Infra: ESM." |
1399 | 46 | msgstr[0] "" | 60 | msgstr[0] "" |
1400 | 47 | msgstr[1] "" | 61 | msgstr[1] "" |
1401 | 48 | 62 | ||
1402 | 63 | <<<<<<< po/af.po | ||
1403 | 49 | #: ../data/apt_check.py:110 | 64 | #: ../data/apt_check.py:110 |
1404 | 65 | ======= | ||
1405 | 66 | #: ../data/apt_check.py:108 | ||
1406 | 67 | >>>>>>> po/af.po | ||
1407 | 50 | #, fuzzy, python-format | 68 | #, fuzzy, python-format |
1408 | 51 | msgid "%i of these updates is a security update." | 69 | msgid "%i of these updates is a security update." |
1409 | 52 | msgid_plural "%i of these updates are security updates." | 70 | msgid_plural "%i of these updates are security updates." |
1410 | 53 | msgstr[0] "%i bywerking is 'n veiligheidsopdatering." | 71 | msgstr[0] "%i bywerking is 'n veiligheidsopdatering." |
1411 | 54 | msgstr[1] "%i bywerkings is veiligheidsopdaterings." | 72 | msgstr[1] "%i bywerkings is veiligheidsopdaterings." |
1412 | 55 | 73 | ||
1413 | 74 | <<<<<<< po/af.po | ||
1414 | 56 | #: ../data/apt_check.py:119 | 75 | #: ../data/apt_check.py:119 |
1415 | 57 | msgid "To see these additional updates run: apt list --upgradable" | 76 | msgid "To see these additional updates run: apt list --upgradable" |
1416 | 58 | msgstr "" | 77 | msgstr "" |
1417 | 59 | 78 | ||
1418 | 60 | #: ../data/apt_check.py:126 | 79 | #: ../data/apt_check.py:126 |
1419 | 80 | ======= | ||
1420 | 81 | #: ../data/apt_check.py:117 | ||
1421 | 82 | msgid "To see these additional updates run: apt list --upgradable" | ||
1422 | 83 | msgstr "" | ||
1423 | 84 | |||
1424 | 85 | #: ../data/apt_check.py:124 | ||
1425 | 86 | >>>>>>> po/af.po | ||
1426 | 61 | #, python-format | 87 | #, python-format |
1427 | 62 | msgid "Enable UA Infra: ESM to receive %i additional security update." | 88 | msgid "Enable UA Infra: ESM to receive %i additional security update." |
1428 | 63 | msgid_plural "Enable UA Infra: ESM to receive %i additional security updates." | 89 | msgid_plural "Enable UA Infra: ESM to receive %i additional security updates." |
1429 | 64 | msgstr[0] "" | 90 | msgstr[0] "" |
1430 | 65 | msgstr[1] "" | 91 | msgstr[1] "" |
1431 | 66 | 92 | ||
1432 | 93 | <<<<<<< po/af.po | ||
1433 | 67 | #: ../data/apt_check.py:137 | 94 | #: ../data/apt_check.py:137 |
1434 | 68 | msgid "Enable UA Infra: ESM to receive additional future security updates." | 95 | msgid "Enable UA Infra: ESM to receive additional future security updates." |
1435 | 69 | msgstr "" | 96 | msgstr "" |
1436 | @@ -73,19 +100,39 @@ msgid "See https://ubuntu.com/security/esm or run: sudo ua status" | |||
1437 | 73 | msgstr "" | 100 | msgstr "" |
1438 | 74 | 101 | ||
1439 | 75 | #: ../data/apt_check.py:184 | 102 | #: ../data/apt_check.py:184 |
1440 | 103 | ======= | ||
1441 | 104 | #: ../data/apt_check.py:135 | ||
1442 | 105 | msgid "Enable UA Infra: ESM to receive additional future security updates." | ||
1443 | 106 | msgstr "" | ||
1444 | 107 | |||
1445 | 108 | #: ../data/apt_check.py:140 | ||
1446 | 109 | msgid "See https://ubuntu.com/security/esm or run: sudo ua status" | ||
1447 | 110 | msgstr "" | ||
1448 | 111 | |||
1449 | 112 | #: ../data/apt_check.py:182 | ||
1450 | 113 | >>>>>>> po/af.po | ||
1451 | 76 | #, python-format | 114 | #, python-format |
1452 | 77 | msgid "Error: Opening the cache (%s)" | 115 | msgid "Error: Opening the cache (%s)" |
1453 | 78 | msgstr "Fout: oopmaak van kas (%s)" | 116 | msgstr "Fout: oopmaak van kas (%s)" |
1454 | 79 | 117 | ||
1455 | 118 | <<<<<<< po/af.po | ||
1456 | 80 | #: ../data/apt_check.py:194 | 119 | #: ../data/apt_check.py:194 |
1457 | 81 | msgid "Error: BrokenCount > 0" | 120 | msgid "Error: BrokenCount > 0" |
1458 | 82 | msgstr "Fout: BrokenCount > 0" | 121 | msgstr "Fout: BrokenCount > 0" |
1459 | 83 | 122 | ||
1460 | 84 | #: ../data/apt_check.py:201 | 123 | #: ../data/apt_check.py:201 |
1461 | 124 | ======= | ||
1462 | 125 | #: ../data/apt_check.py:192 | ||
1463 | 126 | msgid "Error: BrokenCount > 0" | ||
1464 | 127 | msgstr "Fout: BrokenCount > 0" | ||
1465 | 128 | |||
1466 | 129 | #: ../data/apt_check.py:199 | ||
1467 | 130 | >>>>>>> po/af.po | ||
1468 | 85 | #, python-format | 131 | #, python-format |
1469 | 86 | msgid "Error: Marking the upgrade (%s)" | 132 | msgid "Error: Marking the upgrade (%s)" |
1470 | 87 | msgstr "Fout: Merk van opgradering (%s)" | 133 | msgstr "Fout: Merk van opgradering (%s)" |
1471 | 88 | 134 | ||
1472 | 135 | <<<<<<< po/af.po | ||
1473 | 89 | #: ../data/apt_check.py:310 | 136 | #: ../data/apt_check.py:310 |
1474 | 90 | msgid "Show the packages that are going to be installed/upgraded" | 137 | msgid "Show the packages that are going to be installed/upgraded" |
1475 | 91 | msgstr "Wys die pakkette wat geïnstalleer of opgradeer gaan word" | 138 | msgstr "Wys die pakkette wat geïnstalleer of opgradeer gaan word" |
1476 | @@ -95,6 +142,17 @@ msgid "Show human readable output on stdout" | |||
1477 | 95 | msgstr "Vertoon gemaklik leesbare uitvoer op stdout" | 142 | msgstr "Vertoon gemaklik leesbare uitvoer op stdout" |
1478 | 96 | 143 | ||
1479 | 97 | #: ../data/apt_check.py:320 | 144 | #: ../data/apt_check.py:320 |
1480 | 145 | ======= | ||
1481 | 146 | #: ../data/apt_check.py:309 | ||
1482 | 147 | msgid "Show the packages that are going to be installed/upgraded" | ||
1483 | 148 | msgstr "Wys die pakkette wat geïnstalleer of opgradeer gaan word" | ||
1484 | 149 | |||
1485 | 150 | #: ../data/apt_check.py:315 | ||
1486 | 151 | msgid "Show human readable output on stdout" | ||
1487 | 152 | msgstr "Vertoon gemaklik leesbare uitvoer op stdout" | ||
1488 | 153 | |||
1489 | 154 | #: ../data/apt_check.py:319 | ||
1490 | 155 | >>>>>>> po/af.po | ||
1491 | 98 | msgid "" | 156 | msgid "" |
1492 | 99 | "Return the time in days when security updates are installed unattended (0 " | 157 | "Return the time in days when security updates are installed unattended (0 " |
1493 | 100 | "means disabled)" | 158 | "means disabled)" |
1494 | @@ -126,6 +184,24 @@ msgstr "" | |||
1495 | 126 | "'n Program op u rekenaar het onlangs homself vasgeloop. Kliek op die " | 184 | "'n Program op u rekenaar het onlangs homself vasgeloop. Kliek op die " |
1496 | 127 | "kennisgewing-afbeelding om meer besonderhede te bekom. " | 185 | "kennisgewing-afbeelding om meer besonderhede te bekom. " |
1497 | 128 | 186 | ||
1498 | 187 | <<<<<<< po/af.po | ||
1499 | 188 | ======= | ||
1500 | 189 | #. Create and show the notification | ||
1501 | 190 | #: ../src/avahi.c:16 | ||
1502 | 191 | msgid "Network service discovery disabled" | ||
1503 | 192 | msgstr "Die ontdekking van netwerkdienste is afgeskakel" | ||
1504 | 193 | |||
1505 | 194 | #: ../src/avahi.c:17 | ||
1506 | 195 | msgid "" | ||
1507 | 196 | "Your current network has a .local domain, which is not recommended and " | ||
1508 | 197 | "incompatible with the Avahi network service discovery. The service has been " | ||
1509 | 198 | "disabled." | ||
1510 | 199 | msgstr "" | ||
1511 | 200 | "U huidige netwerk het 'n .local domein. Dit word nie aanbeveel nie en is nie " | ||
1512 | 201 | "bruikbaar met die Avahi-netwerkdiensdetektor nie. Die diens is daarom " | ||
1513 | 202 | "afgeskakel." | ||
1514 | 203 | |||
1515 | 204 | >>>>>>> po/af.po | ||
1516 | 129 | #: ../src/cdroms.c:48 | 205 | #: ../src/cdroms.c:48 |
1517 | 130 | msgid "Software Packages Volume Detected" | 206 | msgid "Software Packages Volume Detected" |
1518 | 131 | msgstr "Skyf met sagtewarepakkette gevind" | 207 | msgstr "Skyf met sagtewarepakkette gevind" |
1519 | @@ -221,9 +297,14 @@ msgid "No current updates" | |||
1520 | 221 | msgstr "-informeer oor opdaterings" | 297 | msgstr "-informeer oor opdaterings" |
1521 | 222 | 298 | ||
1522 | 223 | #: ../src/livepatch-tray.c:148 | 299 | #: ../src/livepatch-tray.c:148 |
1523 | 300 | <<<<<<< po/af.po | ||
1524 | 224 | #, c-format | 301 | #, c-format |
1525 | 225 | msgid "%zd current update" | 302 | msgid "%zd current update" |
1526 | 226 | msgid_plural "%zd current updates" | 303 | msgid_plural "%zd current updates" |
1527 | 304 | ======= | ||
1528 | 305 | msgid "%" | ||
1529 | 306 | msgid_plural "%" | ||
1530 | 307 | >>>>>>> po/af.po | ||
1531 | 227 | msgstr[0] "" | 308 | msgstr[0] "" |
1532 | 228 | msgstr[1] "" | 309 | msgstr[1] "" |
1533 | 229 | 310 | ||
1534 | @@ -327,20 +408,36 @@ msgstr "" | |||
1535 | 327 | msgid "A problem occurred when checking for the updates." | 408 | msgid "A problem occurred when checking for the updates." |
1536 | 328 | msgstr "'n Probleem het ontstaan by die kontrolering van opdaterings" | 409 | msgstr "'n Probleem het ontstaan by die kontrolering van opdaterings" |
1537 | 329 | 410 | ||
1538 | 411 | <<<<<<< po/af.po | ||
1539 | 330 | #: ../src/update-notifier.c:560 | 412 | #: ../src/update-notifier.c:560 |
1540 | 331 | msgid "- inform about updates" | 413 | msgid "- inform about updates" |
1541 | 332 | msgstr "-informeer oor opdaterings" | 414 | msgstr "-informeer oor opdaterings" |
1542 | 333 | 415 | ||
1543 | 334 | #: ../src/update-notifier.c:562 | 416 | #: ../src/update-notifier.c:562 |
1544 | 417 | ======= | ||
1545 | 418 | #: ../src/update-notifier.c:585 | ||
1546 | 419 | msgid "- inform about updates" | ||
1547 | 420 | msgstr "-informeer oor opdaterings" | ||
1548 | 421 | |||
1549 | 422 | #: ../src/update-notifier.c:587 | ||
1550 | 423 | >>>>>>> po/af.po | ||
1551 | 335 | #, c-format | 424 | #, c-format |
1552 | 336 | msgid "Failed to init the UI: %s\n" | 425 | msgid "Failed to init the UI: %s\n" |
1553 | 337 | msgstr "Gebruikerskoppelvlak-inisialisering het misluk: %s\n" | 426 | msgstr "Gebruikerskoppelvlak-inisialisering het misluk: %s\n" |
1554 | 338 | 427 | ||
1555 | 428 | <<<<<<< po/af.po | ||
1556 | 339 | #: ../src/update-notifier.c:563 | 429 | #: ../src/update-notifier.c:563 |
1557 | 340 | msgid "unknown error" | 430 | msgid "unknown error" |
1558 | 341 | msgstr "onbekende fout" | 431 | msgstr "onbekende fout" |
1559 | 342 | 432 | ||
1560 | 343 | #: ../src/update-notifier.c:590 | 433 | #: ../src/update-notifier.c:590 |
1561 | 434 | ======= | ||
1562 | 435 | #: ../src/update-notifier.c:588 | ||
1563 | 436 | msgid "unknown error" | ||
1564 | 437 | msgstr "onbekende fout" | ||
1565 | 438 | |||
1566 | 439 | #: ../src/update-notifier.c:615 | ||
1567 | 440 | >>>>>>> po/af.po | ||
1568 | 344 | msgid "update-notifier" | 441 | msgid "update-notifier" |
1569 | 345 | msgstr "opdateringskennisgewing" | 442 | msgstr "opdateringskennisgewing" |
1570 | 346 | 443 | ||
1571 | @@ -411,11 +508,14 @@ msgstr "" | |||
1572 | 411 | "maak en dan die pakkette verwyder en weer installeer om die probleem reg te " | 508 | "maak en dan die pakkette verwyder en weer installeer om die probleem reg te " |
1573 | 412 | "maak." | 509 | "maak." |
1574 | 413 | 510 | ||
1575 | 511 | <<<<<<< po/af.po | ||
1576 | 414 | #~ msgid "%i package can be updated." | 512 | #~ msgid "%i package can be updated." |
1577 | 415 | #~ msgid_plural "%i packages can be updated." | 513 | #~ msgid_plural "%i packages can be updated." |
1578 | 416 | #~ msgstr[0] "Daar kan %i pakket opgedateer word" | 514 | #~ msgstr[0] "Daar kan %i pakket opgedateer word" |
1579 | 417 | #~ msgstr[1] "Daar kan %i pakkette opgedateer word" | 515 | #~ msgstr[1] "Daar kan %i pakkette opgedateer word" |
1580 | 418 | 516 | ||
1581 | 517 | ======= | ||
1582 | 518 | >>>>>>> po/af.po | ||
1583 | 419 | #~ msgid "" | 519 | #~ msgid "" |
1584 | 420 | #~ "<span weight=\"bold\" size=\"larger\">Please enter your password to " | 520 | #~ "<span weight=\"bold\" size=\"larger\">Please enter your password to " |
1585 | 421 | #~ "access problem reports of system programs</span>" | 521 | #~ "access problem reports of system programs</span>" |
1586 | @@ -423,6 +523,7 @@ msgstr "" | |||
1587 | 423 | #~ "<span weight=\"bold\" size=\"larger\">Verskaf asseblief u wagwoord om " | 523 | #~ "<span weight=\"bold\" size=\"larger\">Verskaf asseblief u wagwoord om " |
1588 | 424 | #~ "foutverslae van u stelselprogramme te kan bekom</span>" | 524 | #~ "foutverslae van u stelselprogramme te kan bekom</span>" |
1589 | 425 | 525 | ||
1590 | 526 | <<<<<<< po/af.po | ||
1591 | 426 | #~ msgid "Network service discovery disabled" | 527 | #~ msgid "Network service discovery disabled" |
1592 | 427 | #~ msgstr "Die ontdekking van netwerkdienste is afgeskakel" | 528 | #~ msgstr "Die ontdekking van netwerkdienste is afgeskakel" |
1593 | 428 | 529 | ||
1594 | @@ -435,6 +536,8 @@ msgstr "" | |||
1595 | 435 | #~ "nie bruikbaar met die Avahi-netwerkdiensdetektor nie. Die diens is daarom " | 536 | #~ "nie bruikbaar met die Avahi-netwerkdiensdetektor nie. Die diens is daarom " |
1596 | 436 | #~ "afgeskakel." | 537 | #~ "afgeskakel." |
1597 | 437 | 538 | ||
1598 | 539 | ======= | ||
1599 | 540 | >>>>>>> po/af.po | ||
1600 | 438 | #~ msgid "Addon volume detected" | 541 | #~ msgid "Addon volume detected" |
1601 | 439 | #~ msgstr "Aanvullende volume gevind" | 542 | #~ msgstr "Aanvullende volume gevind" |
1602 | 440 | 543 | ||
1603 | diff --git a/po/am.po b/po/am.po | |||
1604 | index 7c76446..ee21ce1 100644 | |||
1605 | --- a/po/am.po | |||
1606 | +++ b/po/am.po | |||
1607 | @@ -7,7 +7,11 @@ msgid "" | |||
1608 | 7 | msgstr "" | 7 | msgstr "" |
1609 | 8 | "Project-Id-Version: update-notifier\n" | 8 | "Project-Id-Version: update-notifier\n" |
1610 | 9 | "Report-Msgid-Bugs-To: \n" | 9 | "Report-Msgid-Bugs-To: \n" |
1611 | 10 | <<<<<<< po/am.po | ||
1612 | 10 | "POT-Creation-Date: 2020-11-12 23:53+0000\n" | 11 | "POT-Creation-Date: 2020-11-12 23:53+0000\n" |
1613 | 12 | ======= | ||
1614 | 13 | "POT-Creation-Date: 2020-11-19 05:20+0000\n" | ||
1615 | 14 | >>>>>>> po/am.po | ||
1616 | 11 | "PO-Revision-Date: 2012-10-29 01:19+0000\n" | 15 | "PO-Revision-Date: 2012-10-29 01:19+0000\n" |
1617 | 12 | "Last-Translator: samson <Unknown>\n" | 16 | "Last-Translator: samson <Unknown>\n" |
1618 | 13 | "Language-Team: Amharic <am@li.org>\n" | 17 | "Language-Team: Amharic <am@li.org>\n" |
1619 | @@ -33,6 +37,7 @@ msgid "UA Infra: Extended Security Maintenance (ESM) is not enabled." | |||
1620 | 33 | msgstr "" | 37 | msgstr "" |
1621 | 34 | 38 | ||
1622 | 35 | #: ../data/apt_check.py:93 | 39 | #: ../data/apt_check.py:93 |
1623 | 40 | <<<<<<< po/am.po | ||
1624 | 36 | #, fuzzy, python-format | 41 | #, fuzzy, python-format |
1625 | 37 | msgid "%i update can be installed immediately." | 42 | msgid "%i update can be installed immediately." |
1626 | 38 | msgid_plural "%i updates can be installed immediately." | 43 | msgid_plural "%i updates can be installed immediately." |
1627 | @@ -40,30 +45,52 @@ msgstr[0] "%i ማሻሻያው የደህንነት ማሻሻያ ነው" | |||
1628 | 40 | msgstr[1] "%i ማሻሻያዎቹ የደህንነት ማሻሻያዎች ናቸው" | 45 | msgstr[1] "%i ማሻሻያዎቹ የደህንነት ማሻሻያዎች ናቸው" |
1629 | 41 | 46 | ||
1630 | 42 | #: ../data/apt_check.py:101 | 47 | #: ../data/apt_check.py:101 |
1631 | 48 | ======= | ||
1632 | 49 | #, python-format | ||
1633 | 50 | msgid "%i package can be updated." | ||
1634 | 51 | msgid_plural "%i packages can be updated." | ||
1635 | 52 | msgstr[0] "%i ጥቅሉን ማሻሻል ይቻላል" | ||
1636 | 53 | msgstr[1] "%i ጥቅሎቹን ማሻሻል ይቻላል" | ||
1637 | 54 | |||
1638 | 55 | #: ../data/apt_check.py:99 | ||
1639 | 56 | >>>>>>> po/am.po | ||
1640 | 43 | #, python-format | 57 | #, python-format |
1641 | 44 | msgid "%i of these updates is fixed through UA Infra: ESM." | 58 | msgid "%i of these updates is fixed through UA Infra: ESM." |
1642 | 45 | msgid_plural "%i of these updates are fixed through UA Infra: ESM." | 59 | msgid_plural "%i of these updates are fixed through UA Infra: ESM." |
1643 | 46 | msgstr[0] "" | 60 | msgstr[0] "" |
1644 | 47 | msgstr[1] "" | 61 | msgstr[1] "" |
1645 | 48 | 62 | ||
1646 | 63 | <<<<<<< po/am.po | ||
1647 | 49 | #: ../data/apt_check.py:110 | 64 | #: ../data/apt_check.py:110 |
1648 | 65 | ======= | ||
1649 | 66 | #: ../data/apt_check.py:108 | ||
1650 | 67 | >>>>>>> po/am.po | ||
1651 | 50 | #, fuzzy, python-format | 68 | #, fuzzy, python-format |
1652 | 51 | msgid "%i of these updates is a security update." | 69 | msgid "%i of these updates is a security update." |
1653 | 52 | msgid_plural "%i of these updates are security updates." | 70 | msgid_plural "%i of these updates are security updates." |
1654 | 53 | msgstr[0] "%i ማሻሻያው የደህንነት ማሻሻያ ነው" | 71 | msgstr[0] "%i ማሻሻያው የደህንነት ማሻሻያ ነው" |
1655 | 54 | msgstr[1] "%i ማሻሻያዎቹ የደህንነት ማሻሻያዎች ናቸው" | 72 | msgstr[1] "%i ማሻሻያዎቹ የደህንነት ማሻሻያዎች ናቸው" |
1656 | 55 | 73 | ||
1657 | 74 | <<<<<<< po/am.po | ||
1658 | 56 | #: ../data/apt_check.py:119 | 75 | #: ../data/apt_check.py:119 |
1659 | 57 | msgid "To see these additional updates run: apt list --upgradable" | 76 | msgid "To see these additional updates run: apt list --upgradable" |
1660 | 58 | msgstr "" | 77 | msgstr "" |
1661 | 59 | 78 | ||
1662 | 60 | #: ../data/apt_check.py:126 | 79 | #: ../data/apt_check.py:126 |
1663 | 80 | ======= | ||
1664 | 81 | #: ../data/apt_check.py:117 | ||
1665 | 82 | msgid "To see these additional updates run: apt list --upgradable" | ||
1666 | 83 | msgstr "" | ||
1667 | 84 | |||
1668 | 85 | #: ../data/apt_check.py:124 | ||
1669 | 86 | >>>>>>> po/am.po | ||
1670 | 61 | #, python-format | 87 | #, python-format |
1671 | 62 | msgid "Enable UA Infra: ESM to receive %i additional security update." | 88 | msgid "Enable UA Infra: ESM to receive %i additional security update." |
1672 | 63 | msgid_plural "Enable UA Infra: ESM to receive %i additional security updates." | 89 | msgid_plural "Enable UA Infra: ESM to receive %i additional security updates." |
1673 | 64 | msgstr[0] "" | 90 | msgstr[0] "" |
1674 | 65 | msgstr[1] "" | 91 | msgstr[1] "" |
1675 | 66 | 92 | ||
1676 | 93 | <<<<<<< po/am.po | ||
1677 | 67 | #: ../data/apt_check.py:137 | 94 | #: ../data/apt_check.py:137 |
1678 | 68 | msgid "Enable UA Infra: ESM to receive additional future security updates." | 95 | msgid "Enable UA Infra: ESM to receive additional future security updates." |
1679 | 69 | msgstr "" | 96 | msgstr "" |
1680 | @@ -73,19 +100,39 @@ msgid "See https://ubuntu.com/security/esm or run: sudo ua status" | |||
1681 | 73 | msgstr "" | 100 | msgstr "" |
1682 | 74 | 101 | ||
1683 | 75 | #: ../data/apt_check.py:184 | 102 | #: ../data/apt_check.py:184 |
1684 | 103 | ======= | ||
1685 | 104 | #: ../data/apt_check.py:135 | ||
1686 | 105 | msgid "Enable UA Infra: ESM to receive additional future security updates." | ||
1687 | 106 | msgstr "" | ||
1688 | 107 | |||
1689 | 108 | #: ../data/apt_check.py:140 | ||
1690 | 109 | msgid "See https://ubuntu.com/security/esm or run: sudo ua status" | ||
1691 | 110 | msgstr "" | ||
1692 | 111 | |||
1693 | 112 | #: ../data/apt_check.py:182 | ||
1694 | 113 | >>>>>>> po/am.po | ||
1695 | 76 | #, python-format | 114 | #, python-format |
1696 | 77 | msgid "Error: Opening the cache (%s)" | 115 | msgid "Error: Opening the cache (%s)" |
1697 | 78 | msgstr "ስህተት: ካሽን (%s) በመክፈት ላይ" | 116 | msgstr "ስህተት: ካሽን (%s) በመክፈት ላይ" |
1698 | 79 | 117 | ||
1699 | 118 | <<<<<<< po/am.po | ||
1700 | 80 | #: ../data/apt_check.py:194 | 119 | #: ../data/apt_check.py:194 |
1701 | 81 | msgid "Error: BrokenCount > 0" | 120 | msgid "Error: BrokenCount > 0" |
1702 | 82 | msgstr "ስህተት: የተሰበሩትን በመቁጠር > 0" | 121 | msgstr "ስህተት: የተሰበሩትን በመቁጠር > 0" |
1703 | 83 | 122 | ||
1704 | 84 | #: ../data/apt_check.py:201 | 123 | #: ../data/apt_check.py:201 |
1705 | 124 | ======= | ||
1706 | 125 | #: ../data/apt_check.py:192 | ||
1707 | 126 | msgid "Error: BrokenCount > 0" | ||
1708 | 127 | msgstr "ስህተት: የተሰበሩትን በመቁጠር > 0" | ||
1709 | 128 | |||
1710 | 129 | #: ../data/apt_check.py:199 | ||
1711 | 130 | >>>>>>> po/am.po | ||
1712 | 85 | #, python-format | 131 | #, python-format |
1713 | 86 | msgid "Error: Marking the upgrade (%s)" | 132 | msgid "Error: Marking the upgrade (%s)" |
1714 | 87 | msgstr "ስህተት ማሻሻያውን ምልክት በማድረግ ላይ (%s)" | 133 | msgstr "ስህተት ማሻሻያውን ምልክት በማድረግ ላይ (%s)" |
1715 | 88 | 134 | ||
1716 | 135 | <<<<<<< po/am.po | ||
1717 | 89 | #: ../data/apt_check.py:310 | 136 | #: ../data/apt_check.py:310 |
1718 | 90 | msgid "Show the packages that are going to be installed/upgraded" | 137 | msgid "Show the packages that are going to be installed/upgraded" |
1719 | 91 | msgstr "ማሳየት ጥቅሎችን የሚሻሻሉትን/የሚገጠሙትን" | 138 | msgstr "ማሳየት ጥቅሎችን የሚሻሻሉትን/የሚገጠሙትን" |
1720 | @@ -95,6 +142,17 @@ msgid "Show human readable output on stdout" | |||
1721 | 95 | msgstr "" | 142 | msgstr "" |
1722 | 96 | 143 | ||
1723 | 97 | #: ../data/apt_check.py:320 | 144 | #: ../data/apt_check.py:320 |
1724 | 145 | ======= | ||
1725 | 146 | #: ../data/apt_check.py:309 | ||
1726 | 147 | msgid "Show the packages that are going to be installed/upgraded" | ||
1727 | 148 | msgstr "ማሳየት ጥቅሎችን የሚሻሻሉትን/የሚገጠሙትን" | ||
1728 | 149 | |||
1729 | 150 | #: ../data/apt_check.py:315 | ||
1730 | 151 | msgid "Show human readable output on stdout" | ||
1731 | 152 | msgstr "" | ||
1732 | 153 | |||
1733 | 154 | #: ../data/apt_check.py:319 | ||
1734 | 155 | >>>>>>> po/am.po | ||
1735 | 98 | msgid "" | 156 | msgid "" |
1736 | 99 | "Return the time in days when security updates are installed unattended (0 " | 157 | "Return the time in days when security updates are installed unattended (0 " |
1737 | 100 | "means disabled)" | 158 | "means disabled)" |
1738 | @@ -122,6 +180,21 @@ msgid "" | |||
1739 | 122 | "notification icon to display details. " | 180 | "notification icon to display details. " |
1740 | 123 | msgstr "" | 181 | msgstr "" |
1741 | 124 | 182 | ||
1742 | 183 | <<<<<<< po/am.po | ||
1743 | 184 | ======= | ||
1744 | 185 | #. Create and show the notification | ||
1745 | 186 | #: ../src/avahi.c:16 | ||
1746 | 187 | msgid "Network service discovery disabled" | ||
1747 | 188 | msgstr "" | ||
1748 | 189 | |||
1749 | 190 | #: ../src/avahi.c:17 | ||
1750 | 191 | msgid "" | ||
1751 | 192 | "Your current network has a .local domain, which is not recommended and " | ||
1752 | 193 | "incompatible with the Avahi network service discovery. The service has been " | ||
1753 | 194 | "disabled." | ||
1754 | 195 | msgstr "" | ||
1755 | 196 | |||
1756 | 197 | >>>>>>> po/am.po | ||
1757 | 125 | #: ../src/cdroms.c:48 | 198 | #: ../src/cdroms.c:48 |
1758 | 126 | msgid "Software Packages Volume Detected" | 199 | msgid "Software Packages Volume Detected" |
1759 | 127 | msgstr "የሶፍትዌር ጥቅል መጠን ተገኝቷል" | 200 | msgstr "የሶፍትዌር ጥቅል መጠን ተገኝቷል" |
1760 | @@ -204,9 +277,14 @@ msgid "No current updates" | |||
1761 | 204 | msgstr "- ማሳወቅ ስለ ማሻሻያው" | 277 | msgstr "- ማሳወቅ ስለ ማሻሻያው" |
1762 | 205 | 278 | ||
1763 | 206 | #: ../src/livepatch-tray.c:148 | 279 | #: ../src/livepatch-tray.c:148 |
1764 | 280 | <<<<<<< po/am.po | ||
1765 | 207 | #, c-format | 281 | #, c-format |
1766 | 208 | msgid "%zd current update" | 282 | msgid "%zd current update" |
1767 | 209 | msgid_plural "%zd current updates" | 283 | msgid_plural "%zd current updates" |
1768 | 284 | ======= | ||
1769 | 285 | msgid "%" | ||
1770 | 286 | msgid_plural "%" | ||
1771 | 287 | >>>>>>> po/am.po | ||
1772 | 210 | msgstr[0] "" | 288 | msgstr[0] "" |
1773 | 211 | msgstr[1] "" | 289 | msgstr[1] "" |
1774 | 212 | 290 | ||
1775 | @@ -293,20 +371,36 @@ msgstr "እንደተለመደው ይህ የተተከሉት ጥቅሎች ደጋ | |||
1776 | 293 | msgid "A problem occurred when checking for the updates." | 371 | msgid "A problem occurred when checking for the updates." |
1777 | 294 | msgstr "ስህተት ተፈጥሯል ማሻሻያ በሚፈለገበት ጊዜ" | 372 | msgstr "ስህተት ተፈጥሯል ማሻሻያ በሚፈለገበት ጊዜ" |
1778 | 295 | 373 | ||
1779 | 374 | <<<<<<< po/am.po | ||
1780 | 296 | #: ../src/update-notifier.c:560 | 375 | #: ../src/update-notifier.c:560 |
1781 | 297 | msgid "- inform about updates" | 376 | msgid "- inform about updates" |
1782 | 298 | msgstr "- ማሳወቅ ስለ ማሻሻያው" | 377 | msgstr "- ማሳወቅ ስለ ማሻሻያው" |
1783 | 299 | 378 | ||
1784 | 300 | #: ../src/update-notifier.c:562 | 379 | #: ../src/update-notifier.c:562 |
1785 | 380 | ======= | ||
1786 | 381 | #: ../src/update-notifier.c:585 | ||
1787 | 382 | msgid "- inform about updates" | ||
1788 | 383 | msgstr "- ማሳወቅ ስለ ማሻሻያው" | ||
1789 | 384 | |||
1790 | 385 | #: ../src/update-notifier.c:587 | ||
1791 | 386 | >>>>>>> po/am.po | ||
1792 | 301 | #, c-format | 387 | #, c-format |
1793 | 302 | msgid "Failed to init the UI: %s\n" | 388 | msgid "Failed to init the UI: %s\n" |
1794 | 303 | msgstr "" | 389 | msgstr "" |
1795 | 304 | 390 | ||
1796 | 391 | <<<<<<< po/am.po | ||
1797 | 305 | #: ../src/update-notifier.c:563 | 392 | #: ../src/update-notifier.c:563 |
1798 | 306 | msgid "unknown error" | 393 | msgid "unknown error" |
1799 | 307 | msgstr "ያልታወቀ ስህተት" | 394 | msgstr "ያልታወቀ ስህተት" |
1800 | 308 | 395 | ||
1801 | 309 | #: ../src/update-notifier.c:590 | 396 | #: ../src/update-notifier.c:590 |
1802 | 397 | ======= | ||
1803 | 398 | #: ../src/update-notifier.c:588 | ||
1804 | 399 | msgid "unknown error" | ||
1805 | 400 | msgstr "ያልታወቀ ስህተት" | ||
1806 | 401 | |||
1807 | 402 | #: ../src/update-notifier.c:615 | ||
1808 | 403 | >>>>>>> po/am.po | ||
1809 | 310 | msgid "update-notifier" | 404 | msgid "update-notifier" |
1810 | 311 | msgstr "ማሻሻያ-አሳዋቂ" | 405 | msgstr "ማሻሻያ-አሳዋቂ" |
1811 | 312 | 406 | ||
1812 | @@ -369,11 +463,14 @@ msgid "" | |||
1813 | 369 | "reinstall the packages to fix this problem." | 463 | "reinstall the packages to fix this problem." |
1814 | 370 | msgstr "" | 464 | msgstr "" |
1815 | 371 | 465 | ||
1816 | 466 | <<<<<<< po/am.po | ||
1817 | 372 | #~ msgid "%i package can be updated." | 467 | #~ msgid "%i package can be updated." |
1818 | 373 | #~ msgid_plural "%i packages can be updated." | 468 | #~ msgid_plural "%i packages can be updated." |
1819 | 374 | #~ msgstr[0] "%i ጥቅሉን ማሻሻል ይቻላል" | 469 | #~ msgstr[0] "%i ጥቅሉን ማሻሻል ይቻላል" |
1820 | 375 | #~ msgstr[1] "%i ጥቅሎቹን ማሻሻል ይቻላል" | 470 | #~ msgstr[1] "%i ጥቅሎቹን ማሻሻል ይቻላል" |
1821 | 376 | 471 | ||
1822 | 472 | ======= | ||
1823 | 473 | >>>>>>> po/am.po | ||
1824 | 377 | #~ msgid "System restart required" | 474 | #~ msgid "System restart required" |
1825 | 378 | #~ msgstr "ስርዓቱን እንደገና መጀመር ይስፈልጋል" | 475 | #~ msgstr "ስርዓቱን እንደገና መጀመር ይስፈልጋል" |
1826 | 379 | 476 | ||
1827 | diff --git a/po/an.po b/po/an.po | |||
1828 | index 36995f6..3a239ad 100644 | |||
1829 | --- a/po/an.po | |||
1830 | +++ b/po/an.po | |||
1831 | @@ -7,7 +7,11 @@ msgid "" | |||
1832 | 7 | msgstr "" | 7 | msgstr "" |
1833 | 8 | "Project-Id-Version: update-notifier\n" | 8 | "Project-Id-Version: update-notifier\n" |
1834 | 9 | "Report-Msgid-Bugs-To: \n" | 9 | "Report-Msgid-Bugs-To: \n" |
1835 | 10 | <<<<<<< po/an.po | ||
1836 | 10 | "POT-Creation-Date: 2020-11-12 23:53+0000\n" | 11 | "POT-Creation-Date: 2020-11-12 23:53+0000\n" |
1837 | 12 | ======= | ||
1838 | 13 | "POT-Creation-Date: 2020-11-19 05:20+0000\n" | ||
1839 | 14 | >>>>>>> po/an.po | ||
1840 | 11 | "PO-Revision-Date: 2011-05-04 11:57+0000\n" | 15 | "PO-Revision-Date: 2011-05-04 11:57+0000\n" |
1841 | 12 | "Last-Translator: Daniel Martinez <entaltoaragon@gmail.com>\n" | 16 | "Last-Translator: Daniel Martinez <entaltoaragon@gmail.com>\n" |
1842 | 13 | "Language-Team: Aragonese <an@li.org>\n" | 17 | "Language-Team: Aragonese <an@li.org>\n" |
1843 | @@ -33,6 +37,7 @@ msgid "UA Infra: Extended Security Maintenance (ESM) is not enabled." | |||
1844 | 33 | msgstr "" | 37 | msgstr "" |
1845 | 34 | 38 | ||
1846 | 35 | #: ../data/apt_check.py:93 | 39 | #: ../data/apt_check.py:93 |
1847 | 40 | <<<<<<< po/an.po | ||
1848 | 36 | #, fuzzy, python-format | 41 | #, fuzzy, python-format |
1849 | 37 | msgid "%i update can be installed immediately." | 42 | msgid "%i update can be installed immediately." |
1850 | 38 | msgid_plural "%i updates can be installed immediately." | 43 | msgid_plural "%i updates can be installed immediately." |
1851 | @@ -40,30 +45,52 @@ msgstr[0] "%i esvielle ye de seguridat." | |||
1852 | 40 | msgstr[1] "%i esvielles son de seguridat." | 45 | msgstr[1] "%i esvielles son de seguridat." |
1853 | 41 | 46 | ||
1854 | 42 | #: ../data/apt_check.py:101 | 47 | #: ../data/apt_check.py:101 |
1855 | 48 | ======= | ||
1856 | 49 | #, python-format | ||
1857 | 50 | msgid "%i package can be updated." | ||
1858 | 51 | msgid_plural "%i packages can be updated." | ||
1859 | 52 | msgstr[0] "Ye posible d'esviellar %i paquete." | ||
1860 | 53 | msgstr[1] "Son posibles d'esviellar %i paquetes." | ||
1861 | 54 | |||
1862 | 55 | #: ../data/apt_check.py:99 | ||
1863 | 56 | >>>>>>> po/an.po | ||
1864 | 43 | #, python-format | 57 | #, python-format |
1865 | 44 | msgid "%i of these updates is fixed through UA Infra: ESM." | 58 | msgid "%i of these updates is fixed through UA Infra: ESM." |
1866 | 45 | msgid_plural "%i of these updates are fixed through UA Infra: ESM." | 59 | msgid_plural "%i of these updates are fixed through UA Infra: ESM." |
1867 | 46 | msgstr[0] "" | 60 | msgstr[0] "" |
1868 | 47 | msgstr[1] "" | 61 | msgstr[1] "" |
1869 | 48 | 62 | ||
1870 | 63 | <<<<<<< po/an.po | ||
1871 | 49 | #: ../data/apt_check.py:110 | 64 | #: ../data/apt_check.py:110 |
1872 | 65 | ======= | ||
1873 | 66 | #: ../data/apt_check.py:108 | ||
1874 | 67 | >>>>>>> po/an.po | ||
1875 | 50 | #, fuzzy, python-format | 68 | #, fuzzy, python-format |
1876 | 51 | msgid "%i of these updates is a security update." | 69 | msgid "%i of these updates is a security update." |
1877 | 52 | msgid_plural "%i of these updates are security updates." | 70 | msgid_plural "%i of these updates are security updates." |
1878 | 53 | msgstr[0] "%i esvielle ye de seguridat." | 71 | msgstr[0] "%i esvielle ye de seguridat." |
1879 | 54 | msgstr[1] "%i esvielles son de seguridat." | 72 | msgstr[1] "%i esvielles son de seguridat." |
1880 | 55 | 73 | ||
1881 | 74 | <<<<<<< po/an.po | ||
1882 | 56 | #: ../data/apt_check.py:119 | 75 | #: ../data/apt_check.py:119 |
1883 | 57 | msgid "To see these additional updates run: apt list --upgradable" | 76 | msgid "To see these additional updates run: apt list --upgradable" |
1884 | 58 | msgstr "" | 77 | msgstr "" |
1885 | 59 | 78 | ||
1886 | 60 | #: ../data/apt_check.py:126 | 79 | #: ../data/apt_check.py:126 |
1887 | 80 | ======= | ||
1888 | 81 | #: ../data/apt_check.py:117 | ||
1889 | 82 | msgid "To see these additional updates run: apt list --upgradable" | ||
1890 | 83 | msgstr "" | ||
1891 | 84 | |||
1892 | 85 | #: ../data/apt_check.py:124 | ||
1893 | 86 | >>>>>>> po/an.po | ||
1894 | 61 | #, python-format | 87 | #, python-format |
1895 | 62 | msgid "Enable UA Infra: ESM to receive %i additional security update." | 88 | msgid "Enable UA Infra: ESM to receive %i additional security update." |
1896 | 63 | msgid_plural "Enable UA Infra: ESM to receive %i additional security updates." | 89 | msgid_plural "Enable UA Infra: ESM to receive %i additional security updates." |
1897 | 64 | msgstr[0] "" | 90 | msgstr[0] "" |
1898 | 65 | msgstr[1] "" | 91 | msgstr[1] "" |
1899 | 66 | 92 | ||
1900 | 93 | <<<<<<< po/an.po | ||
1901 | 67 | #: ../data/apt_check.py:137 | 94 | #: ../data/apt_check.py:137 |
1902 | 68 | msgid "Enable UA Infra: ESM to receive additional future security updates." | 95 | msgid "Enable UA Infra: ESM to receive additional future security updates." |
1903 | 69 | msgstr "" | 96 | msgstr "" |
1904 | @@ -73,19 +100,39 @@ msgid "See https://ubuntu.com/security/esm or run: sudo ua status" | |||
1905 | 73 | msgstr "" | 100 | msgstr "" |
1906 | 74 | 101 | ||
1907 | 75 | #: ../data/apt_check.py:184 | 102 | #: ../data/apt_check.py:184 |
1908 | 103 | ======= | ||
1909 | 104 | #: ../data/apt_check.py:135 | ||
1910 | 105 | msgid "Enable UA Infra: ESM to receive additional future security updates." | ||
1911 | 106 | msgstr "" | ||
1912 | 107 | |||
1913 | 108 | #: ../data/apt_check.py:140 | ||
1914 | 109 | msgid "See https://ubuntu.com/security/esm or run: sudo ua status" | ||
1915 | 110 | msgstr "" | ||
1916 | 111 | |||
1917 | 112 | #: ../data/apt_check.py:182 | ||
1918 | 113 | >>>>>>> po/an.po | ||
1919 | 76 | #, python-format | 114 | #, python-format |
1920 | 77 | msgid "Error: Opening the cache (%s)" | 115 | msgid "Error: Opening the cache (%s)" |
1921 | 78 | msgstr "Error: Ubriendo la caché (%s)" | 116 | msgstr "Error: Ubriendo la caché (%s)" |
1922 | 79 | 117 | ||
1923 | 118 | <<<<<<< po/an.po | ||
1924 | 80 | #: ../data/apt_check.py:194 | 119 | #: ../data/apt_check.py:194 |
1925 | 81 | msgid "Error: BrokenCount > 0" | 120 | msgid "Error: BrokenCount > 0" |
1926 | 82 | msgstr "Error: BrokenCount > 0" | 121 | msgstr "Error: BrokenCount > 0" |
1927 | 83 | 122 | ||
1928 | 84 | #: ../data/apt_check.py:201 | 123 | #: ../data/apt_check.py:201 |
1929 | 124 | ======= | ||
1930 | 125 | #: ../data/apt_check.py:192 | ||
1931 | 126 | msgid "Error: BrokenCount > 0" | ||
1932 | 127 | msgstr "Error: BrokenCount > 0" | ||
1933 | 128 | |||
1934 | 129 | #: ../data/apt_check.py:199 | ||
1935 | 130 | >>>>>>> po/an.po | ||
1936 | 85 | #, python-format | 131 | #, python-format |
1937 | 86 | msgid "Error: Marking the upgrade (%s)" | 132 | msgid "Error: Marking the upgrade (%s)" |
1938 | 87 | msgstr "Error: Marcando l'esvielle (%s)" | 133 | msgstr "Error: Marcando l'esvielle (%s)" |
1939 | 88 | 134 | ||
1940 | 135 | <<<<<<< po/an.po | ||
1941 | 89 | #: ../data/apt_check.py:310 | 136 | #: ../data/apt_check.py:310 |
1942 | 90 | msgid "Show the packages that are going to be installed/upgraded" | 137 | msgid "Show the packages that are going to be installed/upgraded" |
1943 | 91 | msgstr "Amostra los paquetes que van a estar instalaus u esviellaus" | 138 | msgstr "Amostra los paquetes que van a estar instalaus u esviellaus" |
1944 | @@ -95,6 +142,17 @@ msgid "Show human readable output on stdout" | |||
1945 | 95 | msgstr "Amuestra una surtida leyible ta humans por stdout" | 142 | msgstr "Amuestra una surtida leyible ta humans por stdout" |
1946 | 96 | 143 | ||
1947 | 97 | #: ../data/apt_check.py:320 | 144 | #: ../data/apt_check.py:320 |
1948 | 145 | ======= | ||
1949 | 146 | #: ../data/apt_check.py:309 | ||
1950 | 147 | msgid "Show the packages that are going to be installed/upgraded" | ||
1951 | 148 | msgstr "Amostra los paquetes que van a estar instalaus u esviellaus" | ||
1952 | 149 | |||
1953 | 150 | #: ../data/apt_check.py:315 | ||
1954 | 151 | msgid "Show human readable output on stdout" | ||
1955 | 152 | msgstr "Amuestra una surtida leyible ta humans por stdout" | ||
1956 | 153 | |||
1957 | 154 | #: ../data/apt_check.py:319 | ||
1958 | 155 | >>>>>>> po/an.po | ||
1959 | 98 | msgid "" | 156 | msgid "" |
1960 | 99 | "Return the time in days when security updates are installed unattended (0 " | 157 | "Return the time in days when security updates are installed unattended (0 " |
1961 | 100 | "means disabled)" | 158 | "means disabled)" |
1962 | @@ -124,6 +182,21 @@ msgid "" | |||
1963 | 124 | "notification icon to display details. " | 182 | "notification icon to display details. " |
1964 | 125 | msgstr "" | 183 | msgstr "" |
1965 | 126 | 184 | ||
1966 | 185 | <<<<<<< po/an.po | ||
1967 | 186 | ======= | ||
1968 | 187 | #. Create and show the notification | ||
1969 | 188 | #: ../src/avahi.c:16 | ||
1970 | 189 | msgid "Network service discovery disabled" | ||
1971 | 190 | msgstr "Servicio d'autodetección de rete desactivau" | ||
1972 | 191 | |||
1973 | 192 | #: ../src/avahi.c:17 | ||
1974 | 193 | msgid "" | ||
1975 | 194 | "Your current network has a .local domain, which is not recommended and " | ||
1976 | 195 | "incompatible with the Avahi network service discovery. The service has been " | ||
1977 | 196 | "disabled." | ||
1978 | 197 | msgstr "" | ||
1979 | 198 | |||
1980 | 199 | >>>>>>> po/an.po | ||
1981 | 127 | #: ../src/cdroms.c:48 | 200 | #: ../src/cdroms.c:48 |
1982 | 128 | msgid "Software Packages Volume Detected" | 201 | msgid "Software Packages Volume Detected" |
1983 | 129 | msgstr "Volumen de paquetz de software detectau" | 202 | msgstr "Volumen de paquetz de software detectau" |
1984 | @@ -207,9 +280,14 @@ msgid "No current updates" | |||
1985 | 207 | msgstr "Amostrar esvielles" | 280 | msgstr "Amostrar esvielles" |
1986 | 208 | 281 | ||
1987 | 209 | #: ../src/livepatch-tray.c:148 | 282 | #: ../src/livepatch-tray.c:148 |
1988 | 283 | <<<<<<< po/an.po | ||
1989 | 210 | #, c-format | 284 | #, c-format |
1990 | 211 | msgid "%zd current update" | 285 | msgid "%zd current update" |
1991 | 212 | msgid_plural "%zd current updates" | 286 | msgid_plural "%zd current updates" |
1992 | 287 | ======= | ||
1993 | 288 | msgid "%" | ||
1994 | 289 | msgid_plural "%" | ||
1995 | 290 | >>>>>>> po/an.po | ||
1996 | 213 | msgstr[0] "" | 291 | msgstr[0] "" |
1997 | 214 | msgstr[1] "" | 292 | msgstr[1] "" |
1998 | 215 | 293 | ||
1999 | @@ -298,20 +376,36 @@ msgstr "" | |||
2000 | 298 | msgid "A problem occurred when checking for the updates." | 376 | msgid "A problem occurred when checking for the updates." |
2001 | 299 | msgstr "" | 377 | msgstr "" |
2002 | 300 | 378 | ||
2003 | 379 | <<<<<<< po/an.po | ||
2004 | 301 | #: ../src/update-notifier.c:560 | 380 | #: ../src/update-notifier.c:560 |
2005 | 302 | msgid "- inform about updates" | 381 | msgid "- inform about updates" |
2006 | 303 | msgstr "" | 382 | msgstr "" |
2007 | 304 | 383 | ||
2008 | 305 | #: ../src/update-notifier.c:562 | 384 | #: ../src/update-notifier.c:562 |
2009 | 385 | ======= | ||
2010 | 386 | #: ../src/update-notifier.c:585 | ||
2011 | 387 | msgid "- inform about updates" | ||
2012 | 388 | msgstr "" | ||
2013 | 389 | |||
2014 | 390 | #: ../src/update-notifier.c:587 | ||
2015 | 391 | >>>>>>> po/an.po | ||
2016 | 306 | #, c-format | 392 | #, c-format |
2017 | 307 | msgid "Failed to init the UI: %s\n" | 393 | msgid "Failed to init the UI: %s\n" |
2018 | 308 | msgstr "" | 394 | msgstr "" |
2019 | 309 | 395 | ||
2020 | 396 | <<<<<<< po/an.po | ||
2021 | 310 | #: ../src/update-notifier.c:563 | 397 | #: ../src/update-notifier.c:563 |
2022 | 311 | msgid "unknown error" | 398 | msgid "unknown error" |
2023 | 312 | msgstr "error desconoxiu" | 399 | msgstr "error desconoxiu" |
2024 | 313 | 400 | ||
2025 | 314 | #: ../src/update-notifier.c:590 | 401 | #: ../src/update-notifier.c:590 |
2026 | 402 | ======= | ||
2027 | 403 | #: ../src/update-notifier.c:588 | ||
2028 | 404 | msgid "unknown error" | ||
2029 | 405 | msgstr "error desconoxiu" | ||
2030 | 406 | |||
2031 | 407 | #: ../src/update-notifier.c:615 | ||
2032 | 408 | >>>>>>> po/an.po | ||
2033 | 315 | msgid "update-notifier" | 409 | msgid "update-notifier" |
2034 | 316 | msgstr "Notificador d'esvielles" | 410 | msgstr "Notificador d'esvielles" |
2035 | 317 | 411 | ||
2036 | @@ -374,11 +468,14 @@ msgid "" | |||
2037 | 374 | "reinstall the packages to fix this problem." | 468 | "reinstall the packages to fix this problem." |
2038 | 375 | msgstr "" | 469 | msgstr "" |
2039 | 376 | 470 | ||
2040 | 471 | <<<<<<< po/an.po | ||
2041 | 377 | #~ msgid "%i package can be updated." | 472 | #~ msgid "%i package can be updated." |
2042 | 378 | #~ msgid_plural "%i packages can be updated." | 473 | #~ msgid_plural "%i packages can be updated." |
2043 | 379 | #~ msgstr[0] "Ye posible d'esviellar %i paquete." | 474 | #~ msgstr[0] "Ye posible d'esviellar %i paquete." |
2044 | 380 | #~ msgstr[1] "Son posibles d'esviellar %i paquetes." | 475 | #~ msgstr[1] "Son posibles d'esviellar %i paquetes." |
2045 | 381 | 476 | ||
2046 | 477 | ======= | ||
2047 | 478 | >>>>>>> po/an.po | ||
2048 | 382 | #~ msgid "" | 479 | #~ msgid "" |
2049 | 383 | #~ "<span weight=\"bold\" size=\"larger\">Please enter your password to " | 480 | #~ "<span weight=\"bold\" size=\"larger\">Please enter your password to " |
2050 | 384 | #~ "access problem reports of system programs</span>" | 481 | #~ "access problem reports of system programs</span>" |
2051 | @@ -386,9 +483,12 @@ msgstr "" | |||
2052 | 386 | #~ "<span weight=\"bold\" size=\"larger\">Meta o suya clau de paso ta acceder " | 483 | #~ "<span weight=\"bold\" size=\"larger\">Meta o suya clau de paso ta acceder " |
2053 | 387 | #~ "a os informes d'os programas d'o sistema</span>" | 484 | #~ "a os informes d'os programas d'o sistema</span>" |
2054 | 388 | 485 | ||
2055 | 486 | <<<<<<< po/an.po | ||
2056 | 389 | #~ msgid "Network service discovery disabled" | 487 | #~ msgid "Network service discovery disabled" |
2057 | 390 | #~ msgstr "Servicio d'autodetección de rete desactivau" | 488 | #~ msgstr "Servicio d'autodetección de rete desactivau" |
2058 | 391 | 489 | ||
2059 | 490 | ======= | ||
2060 | 491 | >>>>>>> po/an.po | ||
2061 | 392 | #~ msgid "Addon volume detected" | 492 | #~ msgid "Addon volume detected" |
2062 | 393 | #~ msgstr "S'ha detectau un disco suplementario" | 493 | #~ msgstr "S'ha detectau un disco suplementario" |
2063 | 394 | 494 | ||
2064 | diff --git a/po/ar.po b/po/ar.po | |||
2065 | index affc920..7c8fa7c 100644 | |||
2066 | --- a/po/ar.po | |||
2067 | +++ b/po/ar.po | |||
2068 | @@ -10,7 +10,11 @@ msgid "" | |||
2069 | 10 | msgstr "" | 10 | msgstr "" |
2070 | 11 | "Project-Id-Version: po_update-notifier-ar\n" | 11 | "Project-Id-Version: po_update-notifier-ar\n" |
2071 | 12 | "Report-Msgid-Bugs-To: \n" | 12 | "Report-Msgid-Bugs-To: \n" |
2072 | 13 | <<<<<<< po/ar.po | ||
2073 | 13 | "POT-Creation-Date: 2020-11-12 23:53+0000\n" | 14 | "POT-Creation-Date: 2020-11-12 23:53+0000\n" |
2074 | 15 | ======= | ||
2075 | 16 | "POT-Creation-Date: 2020-11-19 05:20+0000\n" | ||
2076 | 17 | >>>>>>> po/ar.po | ||
2077 | 14 | "PO-Revision-Date: 2012-09-06 02:40+0000\n" | 18 | "PO-Revision-Date: 2012-09-06 02:40+0000\n" |
2078 | 15 | "Last-Translator: Ibrahim Saed <ibraheem5000@gmail.com>\n" | 19 | "Last-Translator: Ibrahim Saed <ibraheem5000@gmail.com>\n" |
2079 | 16 | "Language-Team: Arabic\n" | 20 | "Language-Team: Arabic\n" |
2080 | @@ -37,6 +41,7 @@ msgid "UA Infra: Extended Security Maintenance (ESM) is not enabled." | |||
2081 | 37 | msgstr "" | 41 | msgstr "" |
2082 | 38 | 42 | ||
2083 | 39 | #: ../data/apt_check.py:93 | 43 | #: ../data/apt_check.py:93 |
2084 | 44 | <<<<<<< po/ar.po | ||
2085 | 40 | #, fuzzy, python-format | 45 | #, fuzzy, python-format |
2086 | 41 | msgid "%i update can be installed immediately." | 46 | msgid "%i update can be installed immediately." |
2087 | 42 | msgid_plural "%i updates can be installed immediately." | 47 | msgid_plural "%i updates can be installed immediately." |
2088 | @@ -48,6 +53,19 @@ msgstr[4] "%i تحديثا أمنيا." | |||
2089 | 48 | msgstr[5] "%i تحديث أمنيا." | 53 | msgstr[5] "%i تحديث أمنيا." |
2090 | 49 | 54 | ||
2091 | 50 | #: ../data/apt_check.py:101 | 55 | #: ../data/apt_check.py:101 |
2092 | 56 | ======= | ||
2093 | 57 | #, python-format | ||
2094 | 58 | msgid "%i package can be updated." | ||
2095 | 59 | msgid_plural "%i packages can be updated." | ||
2096 | 60 | msgstr[0] "لا حزم يمكن تحديثها." | ||
2097 | 61 | msgstr[1] "حزمة واحدة يمكن تحديثها." | ||
2098 | 62 | msgstr[2] "حزمتان يمكن تحديثهما." | ||
2099 | 63 | msgstr[3] "%i حزم يمكن تحديثها." | ||
2100 | 64 | msgstr[4] "%i حزمة يمكن تحديثها." | ||
2101 | 65 | msgstr[5] "%i حزمة يمكن تحديثها." | ||
2102 | 66 | |||
2103 | 67 | #: ../data/apt_check.py:99 | ||
2104 | 68 | >>>>>>> po/ar.po | ||
2105 | 51 | #, python-format | 69 | #, python-format |
2106 | 52 | msgid "%i of these updates is fixed through UA Infra: ESM." | 70 | msgid "%i of these updates is fixed through UA Infra: ESM." |
2107 | 53 | msgid_plural "%i of these updates are fixed through UA Infra: ESM." | 71 | msgid_plural "%i of these updates are fixed through UA Infra: ESM." |
2108 | @@ -58,7 +76,11 @@ msgstr[3] "" | |||
2109 | 58 | msgstr[4] "" | 76 | msgstr[4] "" |
2110 | 59 | msgstr[5] "" | 77 | msgstr[5] "" |
2111 | 60 | 78 | ||
2112 | 79 | <<<<<<< po/ar.po | ||
2113 | 61 | #: ../data/apt_check.py:110 | 80 | #: ../data/apt_check.py:110 |
2114 | 81 | ======= | ||
2115 | 82 | #: ../data/apt_check.py:108 | ||
2116 | 83 | >>>>>>> po/ar.po | ||
2117 | 62 | #, fuzzy, python-format | 84 | #, fuzzy, python-format |
2118 | 63 | msgid "%i of these updates is a security update." | 85 | msgid "%i of these updates is a security update." |
2119 | 64 | msgid_plural "%i of these updates are security updates." | 86 | msgid_plural "%i of these updates are security updates." |
2120 | @@ -69,11 +91,19 @@ msgstr[3] "%i تحديثات أمنية." | |||
2121 | 69 | msgstr[4] "%i تحديثا أمنيا." | 91 | msgstr[4] "%i تحديثا أمنيا." |
2122 | 70 | msgstr[5] "%i تحديث أمنيا." | 92 | msgstr[5] "%i تحديث أمنيا." |
2123 | 71 | 93 | ||
2124 | 94 | <<<<<<< po/ar.po | ||
2125 | 72 | #: ../data/apt_check.py:119 | 95 | #: ../data/apt_check.py:119 |
2126 | 73 | msgid "To see these additional updates run: apt list --upgradable" | 96 | msgid "To see these additional updates run: apt list --upgradable" |
2127 | 74 | msgstr "" | 97 | msgstr "" |
2128 | 75 | 98 | ||
2129 | 76 | #: ../data/apt_check.py:126 | 99 | #: ../data/apt_check.py:126 |
2130 | 100 | ======= | ||
2131 | 101 | #: ../data/apt_check.py:117 | ||
2132 | 102 | msgid "To see these additional updates run: apt list --upgradable" | ||
2133 | 103 | msgstr "" | ||
2134 | 104 | |||
2135 | 105 | #: ../data/apt_check.py:124 | ||
2136 | 106 | >>>>>>> po/ar.po | ||
2137 | 77 | #, python-format | 107 | #, python-format |
2138 | 78 | msgid "Enable UA Infra: ESM to receive %i additional security update." | 108 | msgid "Enable UA Infra: ESM to receive %i additional security update." |
2139 | 79 | msgid_plural "Enable UA Infra: ESM to receive %i additional security updates." | 109 | msgid_plural "Enable UA Infra: ESM to receive %i additional security updates." |
2140 | @@ -84,6 +114,7 @@ msgstr[3] "" | |||
2141 | 84 | msgstr[4] "" | 114 | msgstr[4] "" |
2142 | 85 | msgstr[5] "" | 115 | msgstr[5] "" |
2143 | 86 | 116 | ||
2144 | 117 | <<<<<<< po/ar.po | ||
2145 | 87 | #: ../data/apt_check.py:137 | 118 | #: ../data/apt_check.py:137 |
2146 | 88 | msgid "Enable UA Infra: ESM to receive additional future security updates." | 119 | msgid "Enable UA Infra: ESM to receive additional future security updates." |
2147 | 89 | msgstr "" | 120 | msgstr "" |
2148 | @@ -93,19 +124,39 @@ msgid "See https://ubuntu.com/security/esm or run: sudo ua status" | |||
2149 | 93 | msgstr "" | 124 | msgstr "" |
2150 | 94 | 125 | ||
2151 | 95 | #: ../data/apt_check.py:184 | 126 | #: ../data/apt_check.py:184 |
2152 | 127 | ======= | ||
2153 | 128 | #: ../data/apt_check.py:135 | ||
2154 | 129 | msgid "Enable UA Infra: ESM to receive additional future security updates." | ||
2155 | 130 | msgstr "" | ||
2156 | 131 | |||
2157 | 132 | #: ../data/apt_check.py:140 | ||
2158 | 133 | msgid "See https://ubuntu.com/security/esm or run: sudo ua status" | ||
2159 | 134 | msgstr "" | ||
2160 | 135 | |||
2161 | 136 | #: ../data/apt_check.py:182 | ||
2162 | 137 | >>>>>>> po/ar.po | ||
2163 | 96 | #, python-format | 138 | #, python-format |
2164 | 97 | msgid "Error: Opening the cache (%s)" | 139 | msgid "Error: Opening the cache (%s)" |
2165 | 98 | msgstr "خطأ: فتح الخبيئة (%s)" | 140 | msgstr "خطأ: فتح الخبيئة (%s)" |
2166 | 99 | 141 | ||
2167 | 142 | <<<<<<< po/ar.po | ||
2168 | 100 | #: ../data/apt_check.py:194 | 143 | #: ../data/apt_check.py:194 |
2169 | 101 | msgid "Error: BrokenCount > 0" | 144 | msgid "Error: BrokenCount > 0" |
2170 | 102 | msgstr "خطأ: عداد الانكسار > 0" | 145 | msgstr "خطأ: عداد الانكسار > 0" |
2171 | 103 | 146 | ||
2172 | 104 | #: ../data/apt_check.py:201 | 147 | #: ../data/apt_check.py:201 |
2173 | 148 | ======= | ||
2174 | 149 | #: ../data/apt_check.py:192 | ||
2175 | 150 | msgid "Error: BrokenCount > 0" | ||
2176 | 151 | msgstr "خطأ: عداد الانكسار > 0" | ||
2177 | 152 | |||
2178 | 153 | #: ../data/apt_check.py:199 | ||
2179 | 154 | >>>>>>> po/ar.po | ||
2180 | 105 | #, python-format | 155 | #, python-format |
2181 | 106 | msgid "Error: Marking the upgrade (%s)" | 156 | msgid "Error: Marking the upgrade (%s)" |
2182 | 107 | msgstr "خطأ: تعليم الترقية (%s)" | 157 | msgstr "خطأ: تعليم الترقية (%s)" |
2183 | 108 | 158 | ||
2184 | 159 | <<<<<<< po/ar.po | ||
2185 | 109 | #: ../data/apt_check.py:310 | 160 | #: ../data/apt_check.py:310 |
2186 | 110 | msgid "Show the packages that are going to be installed/upgraded" | 161 | msgid "Show the packages that are going to be installed/upgraded" |
2187 | 111 | msgstr "أظهر الحزم التي ستثبت/سترقّى" | 162 | msgstr "أظهر الحزم التي ستثبت/سترقّى" |
2188 | @@ -115,6 +166,17 @@ msgid "Show human readable output on stdout" | |||
2189 | 115 | msgstr "أظهر مخرج مقروء من البشر على stdout" | 166 | msgstr "أظهر مخرج مقروء من البشر على stdout" |
2190 | 116 | 167 | ||
2191 | 117 | #: ../data/apt_check.py:320 | 168 | #: ../data/apt_check.py:320 |
2192 | 169 | ======= | ||
2193 | 170 | #: ../data/apt_check.py:309 | ||
2194 | 171 | msgid "Show the packages that are going to be installed/upgraded" | ||
2195 | 172 | msgstr "أظهر الحزم التي ستثبت/سترقّى" | ||
2196 | 173 | |||
2197 | 174 | #: ../data/apt_check.py:315 | ||
2198 | 175 | msgid "Show human readable output on stdout" | ||
2199 | 176 | msgstr "أظهر مخرج مقروء من البشر على stdout" | ||
2200 | 177 | |||
2201 | 178 | #: ../data/apt_check.py:319 | ||
2202 | 179 | >>>>>>> po/ar.po | ||
2203 | 118 | msgid "" | 180 | msgid "" |
2204 | 119 | "Return the time in days when security updates are installed unattended (0 " | 181 | "Return the time in days when security updates are installed unattended (0 " |
2205 | 120 | "means disabled)" | 182 | "means disabled)" |
2206 | @@ -144,6 +206,23 @@ msgstr "" | |||
2207 | 144 | "انهار تطبيق في النظام (للتو أو سابقا). انقر على أيقونة التبليغ لتطالع " | 206 | "انهار تطبيق في النظام (للتو أو سابقا). انقر على أيقونة التبليغ لتطالع " |
2208 | 145 | "التفاصيل. " | 207 | "التفاصيل. " |
2209 | 146 | 208 | ||
2210 | 209 | <<<<<<< po/ar.po | ||
2211 | 210 | ======= | ||
2212 | 211 | #. Create and show the notification | ||
2213 | 212 | #: ../src/avahi.c:16 | ||
2214 | 213 | msgid "Network service discovery disabled" | ||
2215 | 214 | msgstr "عُطِّل استكشاف خدمة الشبكة" | ||
2216 | 215 | |||
2217 | 216 | #: ../src/avahi.c:17 | ||
2218 | 217 | msgid "" | ||
2219 | 218 | "Your current network has a .local domain, which is not recommended and " | ||
2220 | 219 | "incompatible with the Avahi network service discovery. The service has been " | ||
2221 | 220 | "disabled." | ||
2222 | 221 | msgstr "" | ||
2223 | 222 | "لشبكتك الحالية نطاق .local، وهو ما لا ينصح به وليس متوافقا مع استكشاف خدمة " | ||
2224 | 223 | "الشبكة Avahi. عُطِّلت الخدمة." | ||
2225 | 224 | |||
2226 | 225 | >>>>>>> po/ar.po | ||
2227 | 147 | #: ../src/cdroms.c:48 | 226 | #: ../src/cdroms.c:48 |
2228 | 148 | msgid "Software Packages Volume Detected" | 227 | msgid "Software Packages Volume Detected" |
2229 | 149 | msgstr "حجوم حزم البرمجيات اكتشفت" | 228 | msgstr "حجوم حزم البرمجيات اكتشفت" |
2230 | @@ -237,9 +316,14 @@ msgid "No current updates" | |||
2231 | 237 | msgstr "- أبلغ بالتحديثات" | 316 | msgstr "- أبلغ بالتحديثات" |
2232 | 238 | 317 | ||
2233 | 239 | #: ../src/livepatch-tray.c:148 | 318 | #: ../src/livepatch-tray.c:148 |
2234 | 319 | <<<<<<< po/ar.po | ||
2235 | 240 | #, c-format | 320 | #, c-format |
2236 | 241 | msgid "%zd current update" | 321 | msgid "%zd current update" |
2237 | 242 | msgid_plural "%zd current updates" | 322 | msgid_plural "%zd current updates" |
2238 | 323 | ======= | ||
2239 | 324 | msgid "%" | ||
2240 | 325 | msgid_plural "%" | ||
2241 | 326 | >>>>>>> po/ar.po | ||
2242 | 243 | msgstr[0] "" | 327 | msgstr[0] "" |
2243 | 244 | msgstr[1] "" | 328 | msgstr[1] "" |
2244 | 245 | msgstr[2] "" | 329 | msgstr[2] "" |
2245 | @@ -352,20 +436,36 @@ msgstr "يعني هذا غالبا أن حزمك المثبتة تنقصها ا | |||
2246 | 352 | msgid "A problem occurred when checking for the updates." | 436 | msgid "A problem occurred when checking for the updates." |
2247 | 353 | msgstr "طرأت مشكلة أثناء التماس تحديثات." | 437 | msgstr "طرأت مشكلة أثناء التماس تحديثات." |
2248 | 354 | 438 | ||
2249 | 439 | <<<<<<< po/ar.po | ||
2250 | 355 | #: ../src/update-notifier.c:560 | 440 | #: ../src/update-notifier.c:560 |
2251 | 356 | msgid "- inform about updates" | 441 | msgid "- inform about updates" |
2252 | 357 | msgstr "- أبلغ بالتحديثات" | 442 | msgstr "- أبلغ بالتحديثات" |
2253 | 358 | 443 | ||
2254 | 359 | #: ../src/update-notifier.c:562 | 444 | #: ../src/update-notifier.c:562 |
2255 | 445 | ======= | ||
2256 | 446 | #: ../src/update-notifier.c:585 | ||
2257 | 447 | msgid "- inform about updates" | ||
2258 | 448 | msgstr "- أبلغ بالتحديثات" | ||
2259 | 449 | |||
2260 | 450 | #: ../src/update-notifier.c:587 | ||
2261 | 451 | >>>>>>> po/ar.po | ||
2262 | 360 | #, c-format | 452 | #, c-format |
2263 | 361 | msgid "Failed to init the UI: %s\n" | 453 | msgid "Failed to init the UI: %s\n" |
2264 | 362 | msgstr "فشل بدء واجهة الاستخدام: %s\n" | 454 | msgstr "فشل بدء واجهة الاستخدام: %s\n" |
2265 | 363 | 455 | ||
2266 | 456 | <<<<<<< po/ar.po | ||
2267 | 364 | #: ../src/update-notifier.c:563 | 457 | #: ../src/update-notifier.c:563 |
2268 | 365 | msgid "unknown error" | 458 | msgid "unknown error" |
2269 | 366 | msgstr "خطأ مجهول" | 459 | msgstr "خطأ مجهول" |
2270 | 367 | 460 | ||
2271 | 368 | #: ../src/update-notifier.c:590 | 461 | #: ../src/update-notifier.c:590 |
2272 | 462 | ======= | ||
2273 | 463 | #: ../src/update-notifier.c:588 | ||
2274 | 464 | msgid "unknown error" | ||
2275 | 465 | msgstr "خطأ مجهول" | ||
2276 | 466 | |||
2277 | 467 | #: ../src/update-notifier.c:615 | ||
2278 | 468 | >>>>>>> po/ar.po | ||
2279 | 369 | msgid "update-notifier" | 469 | msgid "update-notifier" |
2280 | 370 | msgstr "update-notifier" | 470 | msgstr "update-notifier" |
2281 | 371 | 471 | ||
2282 | @@ -434,6 +534,7 @@ msgstr "" | |||
2283 | 434 | "هذا فشل دائم سيترك هذه الحزم غير صالحة للاستخدام على نظامك. قد تكون بحاجة " | 534 | "هذا فشل دائم سيترك هذه الحزم غير صالحة للاستخدام على نظامك. قد تكون بحاجة " |
2284 | 435 | "لإصلاح اتصالك بالإنترنت، ثم أزِل وأعد تثبيت الحزم لإصلاح هذه المشكلة." | 535 | "لإصلاح اتصالك بالإنترنت، ثم أزِل وأعد تثبيت الحزم لإصلاح هذه المشكلة." |
2285 | 436 | 536 | ||
2286 | 537 | <<<<<<< po/ar.po | ||
2287 | 437 | #~ msgid "%i package can be updated." | 538 | #~ msgid "%i package can be updated." |
2288 | 438 | #~ msgid_plural "%i packages can be updated." | 539 | #~ msgid_plural "%i packages can be updated." |
2289 | 439 | #~ msgstr[0] "لا حزم يمكن تحديثها." | 540 | #~ msgstr[0] "لا حزم يمكن تحديثها." |
2290 | @@ -443,6 +544,8 @@ msgstr "" | |||
2291 | 443 | #~ msgstr[4] "%i حزمة يمكن تحديثها." | 544 | #~ msgstr[4] "%i حزمة يمكن تحديثها." |
2292 | 444 | #~ msgstr[5] "%i حزمة يمكن تحديثها." | 545 | #~ msgstr[5] "%i حزمة يمكن تحديثها." |
2293 | 445 | 546 | ||
2294 | 547 | ======= | ||
2295 | 548 | >>>>>>> po/ar.po | ||
2296 | 446 | #~ msgid "" | 549 | #~ msgid "" |
2297 | 447 | #~ "<span weight=\"bold\" size=\"larger\">Please enter your password to " | 550 | #~ "<span weight=\"bold\" size=\"larger\">Please enter your password to " |
2298 | 448 | #~ "access problem reports of system programs</span>" | 551 | #~ "access problem reports of system programs</span>" |
2299 | @@ -450,6 +553,7 @@ msgstr "" | |||
2300 | 450 | #~ "<span weight=\"bold\" size=\"larger\">من فضلك أدخل كلمة السر لتَنفُذ إلى " | 553 | #~ "<span weight=\"bold\" size=\"larger\">من فضلك أدخل كلمة السر لتَنفُذ إلى " |
2301 | 451 | #~ "الإبلاغ عن أعطال برمجيات النظام</span>" | 554 | #~ "الإبلاغ عن أعطال برمجيات النظام</span>" |
2302 | 452 | 555 | ||
2303 | 556 | <<<<<<< po/ar.po | ||
2304 | 453 | #~ msgid "Network service discovery disabled" | 557 | #~ msgid "Network service discovery disabled" |
2305 | 454 | #~ msgstr "عُطِّل استكشاف خدمة الشبكة" | 558 | #~ msgstr "عُطِّل استكشاف خدمة الشبكة" |
2306 | 455 | 559 | ||
2307 | @@ -461,6 +565,8 @@ msgstr "" | |||
2308 | 461 | #~ "لشبكتك الحالية نطاق .local، وهو ما لا ينصح به وليس متوافقا مع استكشاف " | 565 | #~ "لشبكتك الحالية نطاق .local، وهو ما لا ينصح به وليس متوافقا مع استكشاف " |
2309 | 462 | #~ "خدمة الشبكة Avahi. عُطِّلت الخدمة." | 566 | #~ "خدمة الشبكة Avahi. عُطِّلت الخدمة." |
2310 | 463 | 567 | ||
2311 | 568 | ======= | ||
2312 | 569 | >>>>>>> po/ar.po | ||
2313 | 464 | #~ msgid "Addon volume detected" | 570 | #~ msgid "Addon volume detected" |
2314 | 465 | #~ msgstr "يوجد مجلد ملحقات" | 571 | #~ msgstr "يوجد مجلد ملحقات" |
2315 | 466 | 572 | ||
2316 | diff --git a/po/ast.po b/po/ast.po | |||
2317 | index 816fc11..5d4165a 100644 | |||
2318 | --- a/po/ast.po | |||
2319 | +++ b/po/ast.po | |||
2320 | @@ -7,7 +7,11 @@ msgid "" | |||
2321 | 7 | msgstr "" | 7 | msgstr "" |
2322 | 8 | "Project-Id-Version: update-notifier\n" | 8 | "Project-Id-Version: update-notifier\n" |
2323 | 9 | "Report-Msgid-Bugs-To: \n" | 9 | "Report-Msgid-Bugs-To: \n" |
2324 | 10 | <<<<<<< po/ast.po | ||
2325 | 10 | "POT-Creation-Date: 2020-11-12 23:53+0000\n" | 11 | "POT-Creation-Date: 2020-11-12 23:53+0000\n" |
2326 | 12 | ======= | ||
2327 | 13 | "POT-Creation-Date: 2020-11-19 05:20+0000\n" | ||
2328 | 14 | >>>>>>> po/ast.po | ||
2329 | 11 | "PO-Revision-Date: 2012-10-09 19:59+0000\n" | 15 | "PO-Revision-Date: 2012-10-09 19:59+0000\n" |
2330 | 12 | "Last-Translator: Colin Watson <cjwatson@canonical.com>\n" | 16 | "Last-Translator: Colin Watson <cjwatson@canonical.com>\n" |
2331 | 13 | "Language-Team: Asturian <ast@li.org>\n" | 17 | "Language-Team: Asturian <ast@li.org>\n" |
2332 | @@ -33,6 +37,7 @@ msgid "UA Infra: Extended Security Maintenance (ESM) is not enabled." | |||
2333 | 33 | msgstr "" | 37 | msgstr "" |
2334 | 34 | 38 | ||
2335 | 35 | #: ../data/apt_check.py:93 | 39 | #: ../data/apt_check.py:93 |
2336 | 40 | <<<<<<< po/ast.po | ||
2337 | 36 | #, fuzzy, python-format | 41 | #, fuzzy, python-format |
2338 | 37 | msgid "%i update can be installed immediately." | 42 | msgid "%i update can be installed immediately." |
2339 | 38 | msgid_plural "%i updates can be installed immediately." | 43 | msgid_plural "%i updates can be installed immediately." |
2340 | @@ -40,30 +45,52 @@ msgstr[0] "l'anovamientu %i ye un anovamientu de seguridá." | |||
2341 | 40 | msgstr[1] "los anovamientos %i son anovamientos de seguridá" | 45 | msgstr[1] "los anovamientos %i son anovamientos de seguridá" |
2342 | 41 | 46 | ||
2343 | 42 | #: ../data/apt_check.py:101 | 47 | #: ../data/apt_check.py:101 |
2344 | 48 | ======= | ||
2345 | 49 | #, python-format | ||
2346 | 50 | msgid "%i package can be updated." | ||
2347 | 51 | msgid_plural "%i packages can be updated." | ||
2348 | 52 | msgstr[0] "%i paquete puede anovase." | ||
2349 | 53 | msgstr[1] "%i paquetes pueden anovase." | ||
2350 | 54 | |||
2351 | 55 | #: ../data/apt_check.py:99 | ||
2352 | 56 | >>>>>>> po/ast.po | ||
2353 | 43 | #, python-format | 57 | #, python-format |
2354 | 44 | msgid "%i of these updates is fixed through UA Infra: ESM." | 58 | msgid "%i of these updates is fixed through UA Infra: ESM." |
2355 | 45 | msgid_plural "%i of these updates are fixed through UA Infra: ESM." | 59 | msgid_plural "%i of these updates are fixed through UA Infra: ESM." |
2356 | 46 | msgstr[0] "" | 60 | msgstr[0] "" |
2357 | 47 | msgstr[1] "" | 61 | msgstr[1] "" |
2358 | 48 | 62 | ||
2359 | 63 | <<<<<<< po/ast.po | ||
2360 | 49 | #: ../data/apt_check.py:110 | 64 | #: ../data/apt_check.py:110 |
2361 | 65 | ======= | ||
2362 | 66 | #: ../data/apt_check.py:108 | ||
2363 | 67 | >>>>>>> po/ast.po | ||
2364 | 50 | #, fuzzy, python-format | 68 | #, fuzzy, python-format |
2365 | 51 | msgid "%i of these updates is a security update." | 69 | msgid "%i of these updates is a security update." |
2366 | 52 | msgid_plural "%i of these updates are security updates." | 70 | msgid_plural "%i of these updates are security updates." |
2367 | 53 | msgstr[0] "l'anovamientu %i ye un anovamientu de seguridá." | 71 | msgstr[0] "l'anovamientu %i ye un anovamientu de seguridá." |
2368 | 54 | msgstr[1] "los anovamientos %i son anovamientos de seguridá" | 72 | msgstr[1] "los anovamientos %i son anovamientos de seguridá" |
2369 | 55 | 73 | ||
2370 | 74 | <<<<<<< po/ast.po | ||
2371 | 56 | #: ../data/apt_check.py:119 | 75 | #: ../data/apt_check.py:119 |
2372 | 57 | msgid "To see these additional updates run: apt list --upgradable" | 76 | msgid "To see these additional updates run: apt list --upgradable" |
2373 | 58 | msgstr "" | 77 | msgstr "" |
2374 | 59 | 78 | ||
2375 | 60 | #: ../data/apt_check.py:126 | 79 | #: ../data/apt_check.py:126 |
2376 | 80 | ======= | ||
2377 | 81 | #: ../data/apt_check.py:117 | ||
2378 | 82 | msgid "To see these additional updates run: apt list --upgradable" | ||
2379 | 83 | msgstr "" | ||
2380 | 84 | |||
2381 | 85 | #: ../data/apt_check.py:124 | ||
2382 | 86 | >>>>>>> po/ast.po | ||
2383 | 61 | #, python-format | 87 | #, python-format |
2384 | 62 | msgid "Enable UA Infra: ESM to receive %i additional security update." | 88 | msgid "Enable UA Infra: ESM to receive %i additional security update." |
2385 | 63 | msgid_plural "Enable UA Infra: ESM to receive %i additional security updates." | 89 | msgid_plural "Enable UA Infra: ESM to receive %i additional security updates." |
2386 | 64 | msgstr[0] "" | 90 | msgstr[0] "" |
2387 | 65 | msgstr[1] "" | 91 | msgstr[1] "" |
2388 | 66 | 92 | ||
2389 | 93 | <<<<<<< po/ast.po | ||
2390 | 67 | #: ../data/apt_check.py:137 | 94 | #: ../data/apt_check.py:137 |
2391 | 68 | msgid "Enable UA Infra: ESM to receive additional future security updates." | 95 | msgid "Enable UA Infra: ESM to receive additional future security updates." |
2392 | 69 | msgstr "" | 96 | msgstr "" |
2393 | @@ -73,19 +100,39 @@ msgid "See https://ubuntu.com/security/esm or run: sudo ua status" | |||
2394 | 73 | msgstr "" | 100 | msgstr "" |
2395 | 74 | 101 | ||
2396 | 75 | #: ../data/apt_check.py:184 | 102 | #: ../data/apt_check.py:184 |
2397 | 103 | ======= | ||
2398 | 104 | #: ../data/apt_check.py:135 | ||
2399 | 105 | msgid "Enable UA Infra: ESM to receive additional future security updates." | ||
2400 | 106 | msgstr "" | ||
2401 | 107 | |||
2402 | 108 | #: ../data/apt_check.py:140 | ||
2403 | 109 | msgid "See https://ubuntu.com/security/esm or run: sudo ua status" | ||
2404 | 110 | msgstr "" | ||
2405 | 111 | |||
2406 | 112 | #: ../data/apt_check.py:182 | ||
2407 | 113 | >>>>>>> po/ast.po | ||
2408 | 76 | #, python-format | 114 | #, python-format |
2409 | 77 | msgid "Error: Opening the cache (%s)" | 115 | msgid "Error: Opening the cache (%s)" |
2410 | 78 | msgstr "Fallu: Abriendo la caché (%s)" | 116 | msgstr "Fallu: Abriendo la caché (%s)" |
2411 | 79 | 117 | ||
2412 | 118 | <<<<<<< po/ast.po | ||
2413 | 80 | #: ../data/apt_check.py:194 | 119 | #: ../data/apt_check.py:194 |
2414 | 81 | msgid "Error: BrokenCount > 0" | 120 | msgid "Error: BrokenCount > 0" |
2415 | 82 | msgstr "Fallu: BrokenCount > 0" | 121 | msgstr "Fallu: BrokenCount > 0" |
2416 | 83 | 122 | ||
2417 | 84 | #: ../data/apt_check.py:201 | 123 | #: ../data/apt_check.py:201 |
2418 | 124 | ======= | ||
2419 | 125 | #: ../data/apt_check.py:192 | ||
2420 | 126 | msgid "Error: BrokenCount > 0" | ||
2421 | 127 | msgstr "Fallu: BrokenCount > 0" | ||
2422 | 128 | |||
2423 | 129 | #: ../data/apt_check.py:199 | ||
2424 | 130 | >>>>>>> po/ast.po | ||
2425 | 85 | #, python-format | 131 | #, python-format |
2426 | 86 | msgid "Error: Marking the upgrade (%s)" | 132 | msgid "Error: Marking the upgrade (%s)" |
2427 | 87 | msgstr "Fallu: Marcando l'actualización (%s)" | 133 | msgstr "Fallu: Marcando l'actualización (%s)" |
2428 | 88 | 134 | ||
2429 | 135 | <<<<<<< po/ast.po | ||
2430 | 89 | #: ../data/apt_check.py:310 | 136 | #: ../data/apt_check.py:310 |
2431 | 90 | msgid "Show the packages that are going to be installed/upgraded" | 137 | msgid "Show the packages that are going to be installed/upgraded" |
2432 | 91 | msgstr "Amuesa los paquetes que van ser instalaos o actualizaos" | 138 | msgstr "Amuesa los paquetes que van ser instalaos o actualizaos" |
2433 | @@ -95,6 +142,17 @@ msgid "Show human readable output on stdout" | |||
2434 | 95 | msgstr "Amuesa una salida llexible pa humanos en stdout" | 142 | msgstr "Amuesa una salida llexible pa humanos en stdout" |
2435 | 96 | 143 | ||
2436 | 97 | #: ../data/apt_check.py:320 | 144 | #: ../data/apt_check.py:320 |
2437 | 145 | ======= | ||
2438 | 146 | #: ../data/apt_check.py:309 | ||
2439 | 147 | msgid "Show the packages that are going to be installed/upgraded" | ||
2440 | 148 | msgstr "Amuesa los paquetes que van ser instalaos o actualizaos" | ||
2441 | 149 | |||
2442 | 150 | #: ../data/apt_check.py:315 | ||
2443 | 151 | msgid "Show human readable output on stdout" | ||
2444 | 152 | msgstr "Amuesa una salida llexible pa humanos en stdout" | ||
2445 | 153 | |||
2446 | 154 | #: ../data/apt_check.py:319 | ||
2447 | 155 | >>>>>>> po/ast.po | ||
2448 | 98 | msgid "" | 156 | msgid "" |
2449 | 99 | "Return the time in days when security updates are installed unattended (0 " | 157 | "Return the time in days when security updates are installed unattended (0 " |
2450 | 100 | "means disabled)" | 158 | "means disabled)" |
2451 | @@ -126,6 +184,23 @@ msgstr "" | |||
2452 | 126 | "Una aplicación quedo colingada nel so sistema (agora o nel pasáu). Calque " | 184 | "Una aplicación quedo colingada nel so sistema (agora o nel pasáu). Calque " |
2453 | 127 | "sobro l'iconu de notificación p'amosar más detais. " | 185 | "sobro l'iconu de notificación p'amosar más detais. " |
2454 | 128 | 186 | ||
2455 | 187 | <<<<<<< po/ast.po | ||
2456 | 188 | ======= | ||
2457 | 189 | #. Create and show the notification | ||
2458 | 190 | #: ../src/avahi.c:16 | ||
2459 | 191 | msgid "Network service discovery disabled" | ||
2460 | 192 | msgstr "Serviciu d'autodeteición de rede deshabilitáu" | ||
2461 | 193 | |||
2462 | 194 | #: ../src/avahi.c:17 | ||
2463 | 195 | msgid "" | ||
2464 | 196 | "Your current network has a .local domain, which is not recommended and " | ||
2465 | 197 | "incompatible with the Avahi network service discovery. The service has been " | ||
2466 | 198 | "disabled." | ||
2467 | 199 | msgstr "" | ||
2468 | 200 | "La so rede actual tien un dominiu .llocal. non recomendáu ya incompatible " | ||
2469 | 201 | "col serviciu d'autodeteición de rede Avahi. El serviciu foi deshabilitáu" | ||
2470 | 202 | |||
2471 | 203 | >>>>>>> po/ast.po | ||
2472 | 129 | #: ../src/cdroms.c:48 | 204 | #: ../src/cdroms.c:48 |
2473 | 130 | msgid "Software Packages Volume Detected" | 205 | msgid "Software Packages Volume Detected" |
2474 | 131 | msgstr "Volume de paquetes de software deteutaos" | 206 | msgstr "Volume de paquetes de software deteutaos" |
2475 | @@ -221,9 +296,14 @@ msgid "No current updates" | |||
2476 | 221 | msgstr "- informar sobro los anovamientos" | 296 | msgstr "- informar sobro los anovamientos" |
2477 | 222 | 297 | ||
2478 | 223 | #: ../src/livepatch-tray.c:148 | 298 | #: ../src/livepatch-tray.c:148 |
2479 | 299 | <<<<<<< po/ast.po | ||
2480 | 224 | #, c-format | 300 | #, c-format |
2481 | 225 | msgid "%zd current update" | 301 | msgid "%zd current update" |
2482 | 226 | msgid_plural "%zd current updates" | 302 | msgid_plural "%zd current updates" |
2483 | 303 | ======= | ||
2484 | 304 | msgid "%" | ||
2485 | 305 | msgid_plural "%" | ||
2486 | 306 | >>>>>>> po/ast.po | ||
2487 | 227 | msgstr[0] "" | 307 | msgstr[0] "" |
2488 | 228 | msgstr[1] "" | 308 | msgstr[1] "" |
2489 | 229 | 309 | ||
2490 | @@ -326,20 +406,36 @@ msgstr "" | |||
2491 | 326 | msgid "A problem occurred when checking for the updates." | 406 | msgid "A problem occurred when checking for the updates." |
2492 | 327 | msgstr "Hebo un problema al comprobar les actualizaciones." | 407 | msgstr "Hebo un problema al comprobar les actualizaciones." |
2493 | 328 | 408 | ||
2494 | 409 | <<<<<<< po/ast.po | ||
2495 | 329 | #: ../src/update-notifier.c:560 | 410 | #: ../src/update-notifier.c:560 |
2496 | 330 | msgid "- inform about updates" | 411 | msgid "- inform about updates" |
2497 | 331 | msgstr "- informar sobro los anovamientos" | 412 | msgstr "- informar sobro los anovamientos" |
2498 | 332 | 413 | ||
2499 | 333 | #: ../src/update-notifier.c:562 | 414 | #: ../src/update-notifier.c:562 |
2500 | 415 | ======= | ||
2501 | 416 | #: ../src/update-notifier.c:585 | ||
2502 | 417 | msgid "- inform about updates" | ||
2503 | 418 | msgstr "- informar sobro los anovamientos" | ||
2504 | 419 | |||
2505 | 420 | #: ../src/update-notifier.c:587 | ||
2506 | 421 | >>>>>>> po/ast.po | ||
2507 | 334 | #, c-format | 422 | #, c-format |
2508 | 335 | msgid "Failed to init the UI: %s\n" | 423 | msgid "Failed to init the UI: %s\n" |
2509 | 336 | msgstr "Falló al anicializar la interface d'usuariu: %s\n" | 424 | msgstr "Falló al anicializar la interface d'usuariu: %s\n" |
2510 | 337 | 425 | ||
2511 | 426 | <<<<<<< po/ast.po | ||
2512 | 338 | #: ../src/update-notifier.c:563 | 427 | #: ../src/update-notifier.c:563 |
2513 | 339 | msgid "unknown error" | 428 | msgid "unknown error" |
2514 | 340 | msgstr "fallu desconocíu" | 429 | msgstr "fallu desconocíu" |
2515 | 341 | 430 | ||
2516 | 342 | #: ../src/update-notifier.c:590 | 431 | #: ../src/update-notifier.c:590 |
2517 | 432 | ======= | ||
2518 | 433 | #: ../src/update-notifier.c:588 | ||
2519 | 434 | msgid "unknown error" | ||
2520 | 435 | msgstr "fallu desconocíu" | ||
2521 | 436 | |||
2522 | 437 | #: ../src/update-notifier.c:615 | ||
2523 | 438 | >>>>>>> po/ast.po | ||
2524 | 343 | msgid "update-notifier" | 439 | msgid "update-notifier" |
2525 | 344 | msgstr "notificador-d'anovamientos" | 440 | msgstr "notificador-d'anovamientos" |
2526 | 345 | 441 | ||
2527 | @@ -410,11 +506,14 @@ msgstr "" | |||
2528 | 410 | "sistema. Pues necesitar configurar la to conexón a Internet, dempués " | 506 | "sistema. Pues necesitar configurar la to conexón a Internet, dempués " |
2529 | 411 | "desaniciar y reinstalar los paquetes pa iguar esti problema." | 507 | "desaniciar y reinstalar los paquetes pa iguar esti problema." |
2530 | 412 | 508 | ||
2531 | 509 | <<<<<<< po/ast.po | ||
2532 | 413 | #~ msgid "%i package can be updated." | 510 | #~ msgid "%i package can be updated." |
2533 | 414 | #~ msgid_plural "%i packages can be updated." | 511 | #~ msgid_plural "%i packages can be updated." |
2534 | 415 | #~ msgstr[0] "%i paquete puede anovase." | 512 | #~ msgstr[0] "%i paquete puede anovase." |
2535 | 416 | #~ msgstr[1] "%i paquetes pueden anovase." | 513 | #~ msgstr[1] "%i paquetes pueden anovase." |
2536 | 417 | 514 | ||
2537 | 515 | ======= | ||
2538 | 516 | >>>>>>> po/ast.po | ||
2539 | 418 | #~ msgid "" | 517 | #~ msgid "" |
2540 | 419 | #~ "<span weight=\"bold\" size=\"larger\">Please enter your password to " | 518 | #~ "<span weight=\"bold\" size=\"larger\">Please enter your password to " |
2541 | 420 | #~ "access problem reports of system programs</span>" | 519 | #~ "access problem reports of system programs</span>" |
2542 | @@ -422,6 +521,7 @@ msgstr "" | |||
2543 | 422 | #~ "<span weight=\"bold\" size=\"larger\">Introduz la contraseña p'acceder a " | 521 | #~ "<span weight=\"bold\" size=\"larger\">Introduz la contraseña p'acceder a " |
2544 | 423 | #~ "los informes de problemes de los programes del sistema</span>" | 522 | #~ "los informes de problemes de los programes del sistema</span>" |
2545 | 424 | 523 | ||
2546 | 524 | <<<<<<< po/ast.po | ||
2547 | 425 | #~ msgid "Network service discovery disabled" | 525 | #~ msgid "Network service discovery disabled" |
2548 | 426 | #~ msgstr "Serviciu d'autodeteición de rede deshabilitáu" | 526 | #~ msgstr "Serviciu d'autodeteición de rede deshabilitáu" |
2549 | 427 | 527 | ||
2550 | @@ -433,6 +533,8 @@ msgstr "" | |||
2551 | 433 | #~ "La so rede actual tien un dominiu .llocal. non recomendáu ya incompatible " | 533 | #~ "La so rede actual tien un dominiu .llocal. non recomendáu ya incompatible " |
2552 | 434 | #~ "col serviciu d'autodeteición de rede Avahi. El serviciu foi deshabilitáu" | 534 | #~ "col serviciu d'autodeteición de rede Avahi. El serviciu foi deshabilitáu" |
2553 | 435 | 535 | ||
2554 | 536 | ======= | ||
2555 | 537 | >>>>>>> po/ast.po | ||
2556 | 436 | #~ msgid "Addon volume detected" | 538 | #~ msgid "Addon volume detected" |
2557 | 437 | #~ msgstr "Discu suplementariu deteutáu" | 539 | #~ msgstr "Discu suplementariu deteutáu" |
2558 | 438 | 540 | ||
2559 | diff --git a/po/az.po b/po/az.po | |||
2560 | index e32152f..f1fd5b8 100644 | |||
2561 | --- a/po/az.po | |||
2562 | +++ b/po/az.po | |||
2563 | @@ -7,7 +7,11 @@ msgid "" | |||
2564 | 7 | msgstr "" | 7 | msgstr "" |
2565 | 8 | "Project-Id-Version: update-notifier\n" | 8 | "Project-Id-Version: update-notifier\n" |
2566 | 9 | "Report-Msgid-Bugs-To: \n" | 9 | "Report-Msgid-Bugs-To: \n" |
2567 | 10 | <<<<<<< po/az.po | ||
2568 | 10 | "POT-Creation-Date: 2020-11-12 23:53+0000\n" | 11 | "POT-Creation-Date: 2020-11-12 23:53+0000\n" |
2569 | 12 | ======= | ||
2570 | 13 | "POT-Creation-Date: 2020-11-19 05:20+0000\n" | ||
2571 | 14 | >>>>>>> po/az.po | ||
2572 | 11 | "PO-Revision-Date: 2012-05-14 15:24+0000\n" | 15 | "PO-Revision-Date: 2012-05-14 15:24+0000\n" |
2573 | 12 | "Last-Translator: Arzu Huseynov <arzu.huseyn@gmail.com>\n" | 16 | "Last-Translator: Arzu Huseynov <arzu.huseyn@gmail.com>\n" |
2574 | 13 | "Language-Team: Azerbaijani <az@li.org>\n" | 17 | "Language-Team: Azerbaijani <az@li.org>\n" |
2575 | @@ -34,36 +38,58 @@ msgstr "" | |||
2576 | 34 | 38 | ||
2577 | 35 | #: ../data/apt_check.py:93 | 39 | #: ../data/apt_check.py:93 |
2578 | 36 | #, python-format | 40 | #, python-format |
2579 | 41 | <<<<<<< po/az.po | ||
2580 | 37 | msgid "%i update can be installed immediately." | 42 | msgid "%i update can be installed immediately." |
2581 | 38 | msgid_plural "%i updates can be installed immediately." | 43 | msgid_plural "%i updates can be installed immediately." |
2582 | 39 | msgstr[0] "" | 44 | msgstr[0] "" |
2583 | 40 | msgstr[1] "" | 45 | msgstr[1] "" |
2584 | 41 | 46 | ||
2585 | 42 | #: ../data/apt_check.py:101 | 47 | #: ../data/apt_check.py:101 |
2586 | 48 | ======= | ||
2587 | 49 | msgid "%i package can be updated." | ||
2588 | 50 | msgid_plural "%i packages can be updated." | ||
2589 | 51 | msgstr[0] "%i paket yenilənə bilər." | ||
2590 | 52 | msgstr[1] "%i paketlər yenilənə bilər." | ||
2591 | 53 | |||
2592 | 54 | #: ../data/apt_check.py:99 | ||
2593 | 55 | >>>>>>> po/az.po | ||
2594 | 43 | #, python-format | 56 | #, python-format |
2595 | 44 | msgid "%i of these updates is fixed through UA Infra: ESM." | 57 | msgid "%i of these updates is fixed through UA Infra: ESM." |
2596 | 45 | msgid_plural "%i of these updates are fixed through UA Infra: ESM." | 58 | msgid_plural "%i of these updates are fixed through UA Infra: ESM." |
2597 | 46 | msgstr[0] "" | 59 | msgstr[0] "" |
2598 | 47 | msgstr[1] "" | 60 | msgstr[1] "" |
2599 | 48 | 61 | ||
2600 | 62 | <<<<<<< po/az.po | ||
2601 | 49 | #: ../data/apt_check.py:110 | 63 | #: ../data/apt_check.py:110 |
2602 | 64 | ======= | ||
2603 | 65 | #: ../data/apt_check.py:108 | ||
2604 | 66 | >>>>>>> po/az.po | ||
2605 | 50 | #, python-format | 67 | #, python-format |
2606 | 51 | msgid "%i of these updates is a security update." | 68 | msgid "%i of these updates is a security update." |
2607 | 52 | msgid_plural "%i of these updates are security updates." | 69 | msgid_plural "%i of these updates are security updates." |
2608 | 53 | msgstr[0] "" | 70 | msgstr[0] "" |
2609 | 54 | msgstr[1] "" | 71 | msgstr[1] "" |
2610 | 55 | 72 | ||
2611 | 73 | <<<<<<< po/az.po | ||
2612 | 56 | #: ../data/apt_check.py:119 | 74 | #: ../data/apt_check.py:119 |
2613 | 57 | msgid "To see these additional updates run: apt list --upgradable" | 75 | msgid "To see these additional updates run: apt list --upgradable" |
2614 | 58 | msgstr "" | 76 | msgstr "" |
2615 | 59 | 77 | ||
2616 | 60 | #: ../data/apt_check.py:126 | 78 | #: ../data/apt_check.py:126 |
2617 | 79 | ======= | ||
2618 | 80 | #: ../data/apt_check.py:117 | ||
2619 | 81 | msgid "To see these additional updates run: apt list --upgradable" | ||
2620 | 82 | msgstr "" | ||
2621 | 83 | |||
2622 | 84 | #: ../data/apt_check.py:124 | ||
2623 | 85 | >>>>>>> po/az.po | ||
2624 | 61 | #, python-format | 86 | #, python-format |
2625 | 62 | msgid "Enable UA Infra: ESM to receive %i additional security update." | 87 | msgid "Enable UA Infra: ESM to receive %i additional security update." |
2626 | 63 | msgid_plural "Enable UA Infra: ESM to receive %i additional security updates." | 88 | msgid_plural "Enable UA Infra: ESM to receive %i additional security updates." |
2627 | 64 | msgstr[0] "" | 89 | msgstr[0] "" |
2628 | 65 | msgstr[1] "" | 90 | msgstr[1] "" |
2629 | 66 | 91 | ||
2630 | 92 | <<<<<<< po/az.po | ||
2631 | 67 | #: ../data/apt_check.py:137 | 93 | #: ../data/apt_check.py:137 |
2632 | 68 | msgid "Enable UA Infra: ESM to receive additional future security updates." | 94 | msgid "Enable UA Infra: ESM to receive additional future security updates." |
2633 | 69 | msgstr "" | 95 | msgstr "" |
2634 | @@ -73,19 +99,39 @@ msgid "See https://ubuntu.com/security/esm or run: sudo ua status" | |||
2635 | 73 | msgstr "" | 99 | msgstr "" |
2636 | 74 | 100 | ||
2637 | 75 | #: ../data/apt_check.py:184 | 101 | #: ../data/apt_check.py:184 |
2638 | 102 | ======= | ||
2639 | 103 | #: ../data/apt_check.py:135 | ||
2640 | 104 | msgid "Enable UA Infra: ESM to receive additional future security updates." | ||
2641 | 105 | msgstr "" | ||
2642 | 106 | |||
2643 | 107 | #: ../data/apt_check.py:140 | ||
2644 | 108 | msgid "See https://ubuntu.com/security/esm or run: sudo ua status" | ||
2645 | 109 | msgstr "" | ||
2646 | 110 | |||
2647 | 111 | #: ../data/apt_check.py:182 | ||
2648 | 112 | >>>>>>> po/az.po | ||
2649 | 76 | #, python-format | 113 | #, python-format |
2650 | 77 | msgid "Error: Opening the cache (%s)" | 114 | msgid "Error: Opening the cache (%s)" |
2651 | 78 | msgstr "" | 115 | msgstr "" |
2652 | 79 | 116 | ||
2653 | 117 | <<<<<<< po/az.po | ||
2654 | 80 | #: ../data/apt_check.py:194 | 118 | #: ../data/apt_check.py:194 |
2655 | 81 | msgid "Error: BrokenCount > 0" | 119 | msgid "Error: BrokenCount > 0" |
2656 | 82 | msgstr "" | 120 | msgstr "" |
2657 | 83 | 121 | ||
2658 | 84 | #: ../data/apt_check.py:201 | 122 | #: ../data/apt_check.py:201 |
2659 | 123 | ======= | ||
2660 | 124 | #: ../data/apt_check.py:192 | ||
2661 | 125 | msgid "Error: BrokenCount > 0" | ||
2662 | 126 | msgstr "" | ||
2663 | 127 | |||
2664 | 128 | #: ../data/apt_check.py:199 | ||
2665 | 129 | >>>>>>> po/az.po | ||
2666 | 85 | #, python-format | 130 | #, python-format |
2667 | 86 | msgid "Error: Marking the upgrade (%s)" | 131 | msgid "Error: Marking the upgrade (%s)" |
2668 | 87 | msgstr "" | 132 | msgstr "" |
2669 | 88 | 133 | ||
2670 | 134 | <<<<<<< po/az.po | ||
2671 | 89 | #: ../data/apt_check.py:310 | 135 | #: ../data/apt_check.py:310 |
2672 | 90 | msgid "Show the packages that are going to be installed/upgraded" | 136 | msgid "Show the packages that are going to be installed/upgraded" |
2673 | 91 | msgstr "" | 137 | msgstr "" |
2674 | @@ -95,6 +141,17 @@ msgid "Show human readable output on stdout" | |||
2675 | 95 | msgstr "" | 141 | msgstr "" |
2676 | 96 | 142 | ||
2677 | 97 | #: ../data/apt_check.py:320 | 143 | #: ../data/apt_check.py:320 |
2678 | 144 | ======= | ||
2679 | 145 | #: ../data/apt_check.py:309 | ||
2680 | 146 | msgid "Show the packages that are going to be installed/upgraded" | ||
2681 | 147 | msgstr "" | ||
2682 | 148 | |||
2683 | 149 | #: ../data/apt_check.py:315 | ||
2684 | 150 | msgid "Show human readable output on stdout" | ||
2685 | 151 | msgstr "" | ||
2686 | 152 | |||
2687 | 153 | #: ../data/apt_check.py:319 | ||
2688 | 154 | >>>>>>> po/az.po | ||
2689 | 98 | msgid "" | 155 | msgid "" |
2690 | 99 | "Return the time in days when security updates are installed unattended (0 " | 156 | "Return the time in days when security updates are installed unattended (0 " |
2691 | 100 | "means disabled)" | 157 | "means disabled)" |
2692 | @@ -122,6 +179,21 @@ msgid "" | |||
2693 | 122 | "notification icon to display details. " | 179 | "notification icon to display details. " |
2694 | 123 | msgstr "" | 180 | msgstr "" |
2695 | 124 | 181 | ||
2696 | 182 | <<<<<<< po/az.po | ||
2697 | 183 | ======= | ||
2698 | 184 | #. Create and show the notification | ||
2699 | 185 | #: ../src/avahi.c:16 | ||
2700 | 186 | msgid "Network service discovery disabled" | ||
2701 | 187 | msgstr "" | ||
2702 | 188 | |||
2703 | 189 | #: ../src/avahi.c:17 | ||
2704 | 190 | msgid "" | ||
2705 | 191 | "Your current network has a .local domain, which is not recommended and " | ||
2706 | 192 | "incompatible with the Avahi network service discovery. The service has been " | ||
2707 | 193 | "disabled." | ||
2708 | 194 | msgstr "" | ||
2709 | 195 | |||
2710 | 196 | >>>>>>> po/az.po | ||
2711 | 125 | #: ../src/cdroms.c:48 | 197 | #: ../src/cdroms.c:48 |
2712 | 126 | msgid "Software Packages Volume Detected" | 198 | msgid "Software Packages Volume Detected" |
2713 | 127 | msgstr "" | 199 | msgstr "" |
2714 | @@ -204,9 +276,14 @@ msgid "No current updates" | |||
2715 | 204 | msgstr "Yeniləmələri göstər" | 276 | msgstr "Yeniləmələri göstər" |
2716 | 205 | 277 | ||
2717 | 206 | #: ../src/livepatch-tray.c:148 | 278 | #: ../src/livepatch-tray.c:148 |
2718 | 279 | <<<<<<< po/az.po | ||
2719 | 207 | #, c-format | 280 | #, c-format |
2720 | 208 | msgid "%zd current update" | 281 | msgid "%zd current update" |
2721 | 209 | msgid_plural "%zd current updates" | 282 | msgid_plural "%zd current updates" |
2722 | 283 | ======= | ||
2723 | 284 | msgid "%" | ||
2724 | 285 | msgid_plural "%" | ||
2725 | 286 | >>>>>>> po/az.po | ||
2726 | 210 | msgstr[0] "" | 287 | msgstr[0] "" |
2727 | 211 | msgstr[1] "" | 288 | msgstr[1] "" |
2728 | 212 | 289 | ||
2729 | @@ -293,20 +370,36 @@ msgstr "" | |||
2730 | 293 | msgid "A problem occurred when checking for the updates." | 370 | msgid "A problem occurred when checking for the updates." |
2731 | 294 | msgstr "" | 371 | msgstr "" |
2732 | 295 | 372 | ||
2733 | 373 | <<<<<<< po/az.po | ||
2734 | 296 | #: ../src/update-notifier.c:560 | 374 | #: ../src/update-notifier.c:560 |
2735 | 297 | msgid "- inform about updates" | 375 | msgid "- inform about updates" |
2736 | 298 | msgstr "" | 376 | msgstr "" |
2737 | 299 | 377 | ||
2738 | 300 | #: ../src/update-notifier.c:562 | 378 | #: ../src/update-notifier.c:562 |
2739 | 379 | ======= | ||
2740 | 380 | #: ../src/update-notifier.c:585 | ||
2741 | 381 | msgid "- inform about updates" | ||
2742 | 382 | msgstr "" | ||
2743 | 383 | |||
2744 | 384 | #: ../src/update-notifier.c:587 | ||
2745 | 385 | >>>>>>> po/az.po | ||
2746 | 301 | #, c-format | 386 | #, c-format |
2747 | 302 | msgid "Failed to init the UI: %s\n" | 387 | msgid "Failed to init the UI: %s\n" |
2748 | 303 | msgstr "" | 388 | msgstr "" |
2749 | 304 | 389 | ||
2750 | 390 | <<<<<<< po/az.po | ||
2751 | 305 | #: ../src/update-notifier.c:563 | 391 | #: ../src/update-notifier.c:563 |
2752 | 306 | msgid "unknown error" | 392 | msgid "unknown error" |
2753 | 307 | msgstr "" | 393 | msgstr "" |
2754 | 308 | 394 | ||
2755 | 309 | #: ../src/update-notifier.c:590 | 395 | #: ../src/update-notifier.c:590 |
2756 | 396 | ======= | ||
2757 | 397 | #: ../src/update-notifier.c:588 | ||
2758 | 398 | msgid "unknown error" | ||
2759 | 399 | msgstr "" | ||
2760 | 400 | |||
2761 | 401 | #: ../src/update-notifier.c:615 | ||
2762 | 402 | >>>>>>> po/az.po | ||
2763 | 310 | msgid "update-notifier" | 403 | msgid "update-notifier" |
2764 | 311 | msgstr "" | 404 | msgstr "" |
2765 | 312 | 405 | ||
2766 | @@ -369,11 +462,14 @@ msgid "" | |||
2767 | 369 | "reinstall the packages to fix this problem." | 462 | "reinstall the packages to fix this problem." |
2768 | 370 | msgstr "" | 463 | msgstr "" |
2769 | 371 | 464 | ||
2770 | 465 | <<<<<<< po/az.po | ||
2771 | 372 | #~ msgid "%i package can be updated." | 466 | #~ msgid "%i package can be updated." |
2772 | 373 | #~ msgid_plural "%i packages can be updated." | 467 | #~ msgid_plural "%i packages can be updated." |
2773 | 374 | #~ msgstr[0] "%i paket yenilənə bilər." | 468 | #~ msgstr[0] "%i paket yenilənə bilər." |
2774 | 375 | #~ msgstr[1] "%i paketlər yenilənə bilər." | 469 | #~ msgstr[1] "%i paketlər yenilənə bilər." |
2775 | 376 | 470 | ||
2776 | 471 | ======= | ||
2777 | 472 | >>>>>>> po/az.po | ||
2778 | 377 | #~ msgid "System restart required" | 473 | #~ msgid "System restart required" |
2779 | 378 | #~ msgstr "Sistemin yenidən başlaması mütləqdir" | 474 | #~ msgstr "Sistemin yenidən başlaması mütləqdir" |
2780 | 379 | 475 | ||
2781 | diff --git a/po/be.po b/po/be.po | |||
2782 | index 47f11a9..fbb62b3 100644 | |||
2783 | --- a/po/be.po | |||
2784 | +++ b/po/be.po | |||
2785 | @@ -7,7 +7,11 @@ msgid "" | |||
2786 | 7 | msgstr "" | 7 | msgstr "" |
2787 | 8 | "Project-Id-Version: update-notifier\n" | 8 | "Project-Id-Version: update-notifier\n" |
2788 | 9 | "Report-Msgid-Bugs-To: \n" | 9 | "Report-Msgid-Bugs-To: \n" |
2789 | 10 | <<<<<<< po/be.po | ||
2790 | 10 | "POT-Creation-Date: 2020-11-12 23:53+0000\n" | 11 | "POT-Creation-Date: 2020-11-12 23:53+0000\n" |
2791 | 12 | ======= | ||
2792 | 13 | "POT-Creation-Date: 2020-11-19 05:20+0000\n" | ||
2793 | 14 | >>>>>>> po/be.po | ||
2794 | 11 | "PO-Revision-Date: 2011-10-10 07:18+0000\n" | 15 | "PO-Revision-Date: 2011-10-10 07:18+0000\n" |
2795 | 12 | "Last-Translator: Maksim Tomkowicz <quendimax@gmail.com>\n" | 16 | "Last-Translator: Maksim Tomkowicz <quendimax@gmail.com>\n" |
2796 | 13 | "Language-Team: Belarusian <be@li.org>\n" | 17 | "Language-Team: Belarusian <be@li.org>\n" |
2797 | @@ -34,6 +38,7 @@ msgid "UA Infra: Extended Security Maintenance (ESM) is not enabled." | |||
2798 | 34 | msgstr "" | 38 | msgstr "" |
2799 | 35 | 39 | ||
2800 | 36 | #: ../data/apt_check.py:93 | 40 | #: ../data/apt_check.py:93 |
2801 | 41 | <<<<<<< po/be.po | ||
2802 | 37 | #, fuzzy, python-format | 42 | #, fuzzy, python-format |
2803 | 38 | msgid "%i update can be installed immediately." | 43 | msgid "%i update can be installed immediately." |
2804 | 39 | msgid_plural "%i updates can be installed immediately." | 44 | msgid_plural "%i updates can be installed immediately." |
2805 | @@ -42,6 +47,16 @@ msgstr[1] "%i абнаўленьні з'яўляюцца абнаўленьня | |||
2806 | 42 | msgstr[2] "%i абнаўленьняў з'яўляюцца абнаўленьнямі бясьпекі." | 47 | msgstr[2] "%i абнаўленьняў з'яўляюцца абнаўленьнямі бясьпекі." |
2807 | 43 | 48 | ||
2808 | 44 | #: ../data/apt_check.py:101 | 49 | #: ../data/apt_check.py:101 |
2809 | 50 | ======= | ||
2810 | 51 | #, python-format | ||
2811 | 52 | msgid "%i package can be updated." | ||
2812 | 53 | msgid_plural "%i packages can be updated." | ||
2813 | 54 | msgstr[0] "ёсьць абнаўленьні для %i пакунка." | ||
2814 | 55 | msgstr[1] "ёсьць абнаўленьні для %i пакункаў." | ||
2815 | 56 | msgstr[2] "ёсьць абнаўленьні для %i пакункаў." | ||
2816 | 57 | |||
2817 | 58 | #: ../data/apt_check.py:99 | ||
2818 | 59 | >>>>>>> po/be.po | ||
2819 | 45 | #, python-format | 60 | #, python-format |
2820 | 46 | msgid "%i of these updates is fixed through UA Infra: ESM." | 61 | msgid "%i of these updates is fixed through UA Infra: ESM." |
2821 | 47 | msgid_plural "%i of these updates are fixed through UA Infra: ESM." | 62 | msgid_plural "%i of these updates are fixed through UA Infra: ESM." |
2822 | @@ -49,7 +64,11 @@ msgstr[0] "" | |||
2823 | 49 | msgstr[1] "" | 64 | msgstr[1] "" |
2824 | 50 | msgstr[2] "" | 65 | msgstr[2] "" |
2825 | 51 | 66 | ||
2826 | 67 | <<<<<<< po/be.po | ||
2827 | 52 | #: ../data/apt_check.py:110 | 68 | #: ../data/apt_check.py:110 |
2828 | 69 | ======= | ||
2829 | 70 | #: ../data/apt_check.py:108 | ||
2830 | 71 | >>>>>>> po/be.po | ||
2831 | 53 | #, fuzzy, python-format | 72 | #, fuzzy, python-format |
2832 | 54 | msgid "%i of these updates is a security update." | 73 | msgid "%i of these updates is a security update." |
2833 | 55 | msgid_plural "%i of these updates are security updates." | 74 | msgid_plural "%i of these updates are security updates." |
2834 | @@ -57,11 +76,19 @@ msgstr[0] "%i абнаўленьне з'яўляецца абнаўленьне | |||
2835 | 57 | msgstr[1] "%i абнаўленьні з'яўляюцца абнаўленьнямі бясьпекі." | 76 | msgstr[1] "%i абнаўленьні з'яўляюцца абнаўленьнямі бясьпекі." |
2836 | 58 | msgstr[2] "%i абнаўленьняў з'яўляюцца абнаўленьнямі бясьпекі." | 77 | msgstr[2] "%i абнаўленьняў з'яўляюцца абнаўленьнямі бясьпекі." |
2837 | 59 | 78 | ||
2838 | 79 | <<<<<<< po/be.po | ||
2839 | 60 | #: ../data/apt_check.py:119 | 80 | #: ../data/apt_check.py:119 |
2840 | 61 | msgid "To see these additional updates run: apt list --upgradable" | 81 | msgid "To see these additional updates run: apt list --upgradable" |
2841 | 62 | msgstr "" | 82 | msgstr "" |
2842 | 63 | 83 | ||
2843 | 64 | #: ../data/apt_check.py:126 | 84 | #: ../data/apt_check.py:126 |
2844 | 85 | ======= | ||
2845 | 86 | #: ../data/apt_check.py:117 | ||
2846 | 87 | msgid "To see these additional updates run: apt list --upgradable" | ||
2847 | 88 | msgstr "" | ||
2848 | 89 | |||
2849 | 90 | #: ../data/apt_check.py:124 | ||
2850 | 91 | >>>>>>> po/be.po | ||
2851 | 65 | #, python-format | 92 | #, python-format |
2852 | 66 | msgid "Enable UA Infra: ESM to receive %i additional security update." | 93 | msgid "Enable UA Infra: ESM to receive %i additional security update." |
2853 | 67 | msgid_plural "Enable UA Infra: ESM to receive %i additional security updates." | 94 | msgid_plural "Enable UA Infra: ESM to receive %i additional security updates." |
2854 | @@ -69,6 +96,7 @@ msgstr[0] "" | |||
2855 | 69 | msgstr[1] "" | 96 | msgstr[1] "" |
2856 | 70 | msgstr[2] "" | 97 | msgstr[2] "" |
2857 | 71 | 98 | ||
2858 | 99 | <<<<<<< po/be.po | ||
2859 | 72 | #: ../data/apt_check.py:137 | 100 | #: ../data/apt_check.py:137 |
2860 | 73 | msgid "Enable UA Infra: ESM to receive additional future security updates." | 101 | msgid "Enable UA Infra: ESM to receive additional future security updates." |
2861 | 74 | msgstr "" | 102 | msgstr "" |
2862 | @@ -78,19 +106,39 @@ msgid "See https://ubuntu.com/security/esm or run: sudo ua status" | |||
2863 | 78 | msgstr "" | 106 | msgstr "" |
2864 | 79 | 107 | ||
2865 | 80 | #: ../data/apt_check.py:184 | 108 | #: ../data/apt_check.py:184 |
2866 | 109 | ======= | ||
2867 | 110 | #: ../data/apt_check.py:135 | ||
2868 | 111 | msgid "Enable UA Infra: ESM to receive additional future security updates." | ||
2869 | 112 | msgstr "" | ||
2870 | 113 | |||
2871 | 114 | #: ../data/apt_check.py:140 | ||
2872 | 115 | msgid "See https://ubuntu.com/security/esm or run: sudo ua status" | ||
2873 | 116 | msgstr "" | ||
2874 | 117 | |||
2875 | 118 | #: ../data/apt_check.py:182 | ||
2876 | 119 | >>>>>>> po/be.po | ||
2877 | 81 | #, python-format | 120 | #, python-format |
2878 | 82 | msgid "Error: Opening the cache (%s)" | 121 | msgid "Error: Opening the cache (%s)" |
2879 | 83 | msgstr "Памылка: адкрыцьцё кэша (%s)" | 122 | msgstr "Памылка: адкрыцьцё кэша (%s)" |
2880 | 84 | 123 | ||
2881 | 124 | <<<<<<< po/be.po | ||
2882 | 85 | #: ../data/apt_check.py:194 | 125 | #: ../data/apt_check.py:194 |
2883 | 86 | msgid "Error: BrokenCount > 0" | 126 | msgid "Error: BrokenCount > 0" |
2884 | 87 | msgstr "Памылка: BrokenCount > 0" | 127 | msgstr "Памылка: BrokenCount > 0" |
2885 | 88 | 128 | ||
2886 | 89 | #: ../data/apt_check.py:201 | 129 | #: ../data/apt_check.py:201 |
2887 | 130 | ======= | ||
2888 | 131 | #: ../data/apt_check.py:192 | ||
2889 | 132 | msgid "Error: BrokenCount > 0" | ||
2890 | 133 | msgstr "Памылка: BrokenCount > 0" | ||
2891 | 134 | |||
2892 | 135 | #: ../data/apt_check.py:199 | ||
2893 | 136 | >>>>>>> po/be.po | ||
2894 | 90 | #, python-format | 137 | #, python-format |
2895 | 91 | msgid "Error: Marking the upgrade (%s)" | 138 | msgid "Error: Marking the upgrade (%s)" |
2896 | 92 | msgstr "Памылка: адзначэньне абнаўленьня (%s)" | 139 | msgstr "Памылка: адзначэньне абнаўленьня (%s)" |
2897 | 93 | 140 | ||
2898 | 141 | <<<<<<< po/be.po | ||
2899 | 94 | #: ../data/apt_check.py:310 | 142 | #: ../data/apt_check.py:310 |
2900 | 95 | msgid "Show the packages that are going to be installed/upgraded" | 143 | msgid "Show the packages that are going to be installed/upgraded" |
2901 | 96 | msgstr "Пакункі, якія будуць усталяваны ці абноўлены" | 144 | msgstr "Пакункі, якія будуць усталяваны ці абноўлены" |
2902 | @@ -100,6 +148,17 @@ msgid "Show human readable output on stdout" | |||
2903 | 100 | msgstr "Выводзіць чытабельныя паведамленьні ў stdout" | 148 | msgstr "Выводзіць чытабельныя паведамленьні ў stdout" |
2904 | 101 | 149 | ||
2905 | 102 | #: ../data/apt_check.py:320 | 150 | #: ../data/apt_check.py:320 |
2906 | 151 | ======= | ||
2907 | 152 | #: ../data/apt_check.py:309 | ||
2908 | 153 | msgid "Show the packages that are going to be installed/upgraded" | ||
2909 | 154 | msgstr "Пакункі, якія будуць усталяваны ці абноўлены" | ||
2910 | 155 | |||
2911 | 156 | #: ../data/apt_check.py:315 | ||
2912 | 157 | msgid "Show human readable output on stdout" | ||
2913 | 158 | msgstr "Выводзіць чытабельныя паведамленьні ў stdout" | ||
2914 | 159 | |||
2915 | 160 | #: ../data/apt_check.py:319 | ||
2916 | 161 | >>>>>>> po/be.po | ||
2917 | 103 | msgid "" | 162 | msgid "" |
2918 | 104 | "Return the time in days when security updates are installed unattended (0 " | 163 | "Return the time in days when security updates are installed unattended (0 " |
2919 | 105 | "means disabled)" | 164 | "means disabled)" |
2920 | @@ -131,6 +190,23 @@ msgstr "" | |||
2921 | 131 | "Дастасаваньне ў вашай сыстэме аварыйна завяршыла сваю працу (раней ці " | 190 | "Дастасаваньне ў вашай сыстэме аварыйна завяршыла сваю працу (раней ці " |
2922 | 132 | "зараз). Пстрыкніце на значцы нагадваньня, каб убачыць падрабязнасьці. " | 191 | "зараз). Пстрыкніце на значцы нагадваньня, каб убачыць падрабязнасьці. " |
2923 | 133 | 192 | ||
2924 | 193 | <<<<<<< po/be.po | ||
2925 | 194 | ======= | ||
2926 | 195 | #. Create and show the notification | ||
2927 | 196 | #: ../src/avahi.c:16 | ||
2928 | 197 | msgid "Network service discovery disabled" | ||
2929 | 198 | msgstr "Служба дасьледваньня сеткі адключана" | ||
2930 | 199 | |||
2931 | 200 | #: ../src/avahi.c:17 | ||
2932 | 201 | msgid "" | ||
2933 | 202 | "Your current network has a .local domain, which is not recommended and " | ||
2934 | 203 | "incompatible with the Avahi network service discovery. The service has been " | ||
2935 | 204 | "disabled." | ||
2936 | 205 | msgstr "" | ||
2937 | 206 | "Ваша бягучая сетка мае дамэн .local, які не рэкамэндаваны і несумяшчальны са " | ||
2938 | 207 | "службай дасьледваньня сеткі Avahi. Гэтая служба была адключана." | ||
2939 | 208 | |||
2940 | 209 | >>>>>>> po/be.po | ||
2941 | 134 | #: ../src/cdroms.c:48 | 210 | #: ../src/cdroms.c:48 |
2942 | 135 | msgid "Software Packages Volume Detected" | 211 | msgid "Software Packages Volume Detected" |
2943 | 136 | msgstr "Знойдзены том з пакункамі праграмнага забесьпячэньня" | 212 | msgstr "Знойдзены том з пакункамі праграмнага забесьпячэньня" |
2944 | @@ -225,9 +301,14 @@ msgid "No current updates" | |||
2945 | 225 | msgstr "- інфармуе пра абнаўленьні" | 301 | msgstr "- інфармуе пра абнаўленьні" |
2946 | 226 | 302 | ||
2947 | 227 | #: ../src/livepatch-tray.c:148 | 303 | #: ../src/livepatch-tray.c:148 |
2948 | 304 | <<<<<<< po/be.po | ||
2949 | 228 | #, c-format | 305 | #, c-format |
2950 | 229 | msgid "%zd current update" | 306 | msgid "%zd current update" |
2951 | 230 | msgid_plural "%zd current updates" | 307 | msgid_plural "%zd current updates" |
2952 | 308 | ======= | ||
2953 | 309 | msgid "%" | ||
2954 | 310 | msgid_plural "%" | ||
2955 | 311 | >>>>>>> po/be.po | ||
2956 | 231 | msgstr[0] "" | 312 | msgstr[0] "" |
2957 | 232 | msgstr[1] "" | 313 | msgstr[1] "" |
2958 | 233 | msgstr[2] "" | 314 | msgstr[2] "" |
2959 | @@ -334,20 +415,36 @@ msgstr "" | |||
2960 | 334 | msgid "A problem occurred when checking for the updates." | 415 | msgid "A problem occurred when checking for the updates." |
2961 | 335 | msgstr "Узьнікла праблема ў час праверкі абнаўленьняў." | 416 | msgstr "Узьнікла праблема ў час праверкі абнаўленьняў." |
2962 | 336 | 417 | ||
2963 | 418 | <<<<<<< po/be.po | ||
2964 | 337 | #: ../src/update-notifier.c:560 | 419 | #: ../src/update-notifier.c:560 |
2965 | 338 | msgid "- inform about updates" | 420 | msgid "- inform about updates" |
2966 | 339 | msgstr "- інфармуе пра абнаўленьні" | 421 | msgstr "- інфармуе пра абнаўленьні" |
2967 | 340 | 422 | ||
2968 | 341 | #: ../src/update-notifier.c:562 | 423 | #: ../src/update-notifier.c:562 |
2969 | 424 | ======= | ||
2970 | 425 | #: ../src/update-notifier.c:585 | ||
2971 | 426 | msgid "- inform about updates" | ||
2972 | 427 | msgstr "- інфармуе пра абнаўленьні" | ||
2973 | 428 | |||
2974 | 429 | #: ../src/update-notifier.c:587 | ||
2975 | 430 | >>>>>>> po/be.po | ||
2976 | 342 | #, c-format | 431 | #, c-format |
2977 | 343 | msgid "Failed to init the UI: %s\n" | 432 | msgid "Failed to init the UI: %s\n" |
2978 | 344 | msgstr "Немагчыма ініцыялізаваць UI: %s\n" | 433 | msgstr "Немагчыма ініцыялізаваць UI: %s\n" |
2979 | 345 | 434 | ||
2980 | 435 | <<<<<<< po/be.po | ||
2981 | 346 | #: ../src/update-notifier.c:563 | 436 | #: ../src/update-notifier.c:563 |
2982 | 347 | msgid "unknown error" | 437 | msgid "unknown error" |
2983 | 348 | msgstr "невядомая памылка" | 438 | msgstr "невядомая памылка" |
2984 | 349 | 439 | ||
2985 | 350 | #: ../src/update-notifier.c:590 | 440 | #: ../src/update-notifier.c:590 |
2986 | 441 | ======= | ||
2987 | 442 | #: ../src/update-notifier.c:588 | ||
2988 | 443 | msgid "unknown error" | ||
2989 | 444 | msgstr "невядомая памылка" | ||
2990 | 445 | |||
2991 | 446 | #: ../src/update-notifier.c:615 | ||
2992 | 447 | >>>>>>> po/be.po | ||
2993 | 351 | msgid "update-notifier" | 448 | msgid "update-notifier" |
2994 | 352 | msgstr "нагадвальнік-аб-абнаўленьнях" | 449 | msgstr "нагадвальнік-аб-абнаўленьнях" |
2995 | 353 | 450 | ||
2996 | @@ -410,12 +507,15 @@ msgid "" | |||
2997 | 410 | "reinstall the packages to fix this problem." | 507 | "reinstall the packages to fix this problem." |
2998 | 411 | msgstr "" | 508 | msgstr "" |
2999 | 412 | 509 | ||
3000 | 510 | <<<<<<< po/be.po | ||
3001 | 413 | #~ msgid "%i package can be updated." | 511 | #~ msgid "%i package can be updated." |
3002 | 414 | #~ msgid_plural "%i packages can be updated." | 512 | #~ msgid_plural "%i packages can be updated." |
3003 | 415 | #~ msgstr[0] "ёсьць абнаўленьні для %i пакунка." | 513 | #~ msgstr[0] "ёсьць абнаўленьні для %i пакунка." |
3004 | 416 | #~ msgstr[1] "ёсьць абнаўленьні для %i пакункаў." | 514 | #~ msgstr[1] "ёсьць абнаўленьні для %i пакункаў." |
3005 | 417 | #~ msgstr[2] "ёсьць абнаўленьні для %i пакункаў." | 515 | #~ msgstr[2] "ёсьць абнаўленьні для %i пакункаў." |
3006 | 418 | 516 | ||
3007 | 517 | ======= | ||
3008 | 518 | >>>>>>> po/be.po | ||
3009 | 419 | #~ msgid "" | 519 | #~ msgid "" |
3010 | 420 | #~ "<span weight=\"bold\" size=\"larger\">Please enter your password to " | 520 | #~ "<span weight=\"bold\" size=\"larger\">Please enter your password to " |
3011 | 421 | #~ "access problem reports of system programs</span>" | 521 | #~ "access problem reports of system programs</span>" |
3012 | @@ -424,6 +524,7 @@ msgstr "" | |||
3013 | 424 | #~ "каб атрымаць доступ да паведамленьняў пра праблемы ў сыстэмных праграмах</" | 524 | #~ "каб атрымаць доступ да паведамленьняў пра праблемы ў сыстэмных праграмах</" |
3014 | 425 | #~ "span>" | 525 | #~ "span>" |
3015 | 426 | 526 | ||
3016 | 527 | <<<<<<< po/be.po | ||
3017 | 427 | #~ msgid "Network service discovery disabled" | 528 | #~ msgid "Network service discovery disabled" |
3018 | 428 | #~ msgstr "Служба дасьледваньня сеткі адключана" | 529 | #~ msgstr "Служба дасьледваньня сеткі адключана" |
3019 | 429 | 530 | ||
3020 | @@ -435,6 +536,8 @@ msgstr "" | |||
3021 | 435 | #~ "Ваша бягучая сетка мае дамэн .local, які не рэкамэндаваны і несумяшчальны " | 536 | #~ "Ваша бягучая сетка мае дамэн .local, які не рэкамэндаваны і несумяшчальны " |
3022 | 436 | #~ "са службай дасьледваньня сеткі Avahi. Гэтая служба была адключана." | 537 | #~ "са службай дасьледваньня сеткі Avahi. Гэтая служба была адключана." |
3023 | 437 | 538 | ||
3024 | 539 | ======= | ||
3025 | 540 | >>>>>>> po/be.po | ||
3026 | 438 | #~ msgid "Addon volume detected" | 541 | #~ msgid "Addon volume detected" |
3027 | 439 | #~ msgstr "Знойдзены дадатковы носьбіт" | 542 | #~ msgstr "Знойдзены дадатковы носьбіт" |
3028 | 440 | 543 | ||
3029 | diff --git a/po/bem.po b/po/bem.po | |||
3030 | index 10dc67c..2238352 100644 | |||
3031 | --- a/po/bem.po | |||
3032 | +++ b/po/bem.po | |||
3033 | @@ -7,7 +7,11 @@ msgid "" | |||
3034 | 7 | msgstr "" | 7 | msgstr "" |
3035 | 8 | "Project-Id-Version: update-notifier\n" | 8 | "Project-Id-Version: update-notifier\n" |
3036 | 9 | "Report-Msgid-Bugs-To: \n" | 9 | "Report-Msgid-Bugs-To: \n" |
3037 | 10 | <<<<<<< po/bem.po | ||
3038 | 10 | "POT-Creation-Date: 2020-11-12 23:53+0000\n" | 11 | "POT-Creation-Date: 2020-11-12 23:53+0000\n" |
3039 | 12 | ======= | ||
3040 | 13 | "POT-Creation-Date: 2020-11-19 05:20+0000\n" | ||
3041 | 14 | >>>>>>> po/bem.po | ||
3042 | 11 | "PO-Revision-Date: 2011-05-10 13:07+0000\n" | 15 | "PO-Revision-Date: 2011-05-10 13:07+0000\n" |
3043 | 12 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 16 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
3044 | 13 | "Language-Team: Bemba <bem@li.org>\n" | 17 | "Language-Team: Bemba <bem@li.org>\n" |
3045 | @@ -34,36 +38,58 @@ msgstr "" | |||
3046 | 34 | 38 | ||
3047 | 35 | #: ../data/apt_check.py:93 | 39 | #: ../data/apt_check.py:93 |
3048 | 36 | #, python-format | 40 | #, python-format |
3049 | 41 | <<<<<<< po/bem.po | ||
3050 | 37 | msgid "%i update can be installed immediately." | 42 | msgid "%i update can be installed immediately." |
3051 | 38 | msgid_plural "%i updates can be installed immediately." | 43 | msgid_plural "%i updates can be installed immediately." |
3052 | 39 | msgstr[0] "" | 44 | msgstr[0] "" |
3053 | 40 | msgstr[1] "" | 45 | msgstr[1] "" |
3054 | 41 | 46 | ||
3055 | 42 | #: ../data/apt_check.py:101 | 47 | #: ../data/apt_check.py:101 |
3056 | 48 | ======= | ||
3057 | 49 | msgid "%i package can be updated." | ||
3058 | 50 | msgid_plural "%i packages can be updated." | ||
3059 | 51 | msgstr[0] "" | ||
3060 | 52 | msgstr[1] "" | ||
3061 | 53 | |||
3062 | 54 | #: ../data/apt_check.py:99 | ||
3063 | 55 | >>>>>>> po/bem.po | ||
3064 | 43 | #, python-format | 56 | #, python-format |
3065 | 44 | msgid "%i of these updates is fixed through UA Infra: ESM." | 57 | msgid "%i of these updates is fixed through UA Infra: ESM." |
3066 | 45 | msgid_plural "%i of these updates are fixed through UA Infra: ESM." | 58 | msgid_plural "%i of these updates are fixed through UA Infra: ESM." |
3067 | 46 | msgstr[0] "" | 59 | msgstr[0] "" |
3068 | 47 | msgstr[1] "" | 60 | msgstr[1] "" |
3069 | 48 | 61 | ||
3070 | 62 | <<<<<<< po/bem.po | ||
3071 | 49 | #: ../data/apt_check.py:110 | 63 | #: ../data/apt_check.py:110 |
3072 | 64 | ======= | ||
3073 | 65 | #: ../data/apt_check.py:108 | ||
3074 | 66 | >>>>>>> po/bem.po | ||
3075 | 50 | #, python-format | 67 | #, python-format |
3076 | 51 | msgid "%i of these updates is a security update." | 68 | msgid "%i of these updates is a security update." |
3077 | 52 | msgid_plural "%i of these updates are security updates." | 69 | msgid_plural "%i of these updates are security updates." |
3078 | 53 | msgstr[0] "" | 70 | msgstr[0] "" |
3079 | 54 | msgstr[1] "" | 71 | msgstr[1] "" |
3080 | 55 | 72 | ||
3081 | 73 | <<<<<<< po/bem.po | ||
3082 | 56 | #: ../data/apt_check.py:119 | 74 | #: ../data/apt_check.py:119 |
3083 | 57 | msgid "To see these additional updates run: apt list --upgradable" | 75 | msgid "To see these additional updates run: apt list --upgradable" |
3084 | 58 | msgstr "" | 76 | msgstr "" |
3085 | 59 | 77 | ||
3086 | 60 | #: ../data/apt_check.py:126 | 78 | #: ../data/apt_check.py:126 |
3087 | 79 | ======= | ||
3088 | 80 | #: ../data/apt_check.py:117 | ||
3089 | 81 | msgid "To see these additional updates run: apt list --upgradable" | ||
3090 | 82 | msgstr "" | ||
3091 | 83 | |||
3092 | 84 | #: ../data/apt_check.py:124 | ||
3093 | 85 | >>>>>>> po/bem.po | ||
3094 | 61 | #, python-format | 86 | #, python-format |
3095 | 62 | msgid "Enable UA Infra: ESM to receive %i additional security update." | 87 | msgid "Enable UA Infra: ESM to receive %i additional security update." |
3096 | 63 | msgid_plural "Enable UA Infra: ESM to receive %i additional security updates." | 88 | msgid_plural "Enable UA Infra: ESM to receive %i additional security updates." |
3097 | 64 | msgstr[0] "" | 89 | msgstr[0] "" |
3098 | 65 | msgstr[1] "" | 90 | msgstr[1] "" |
3099 | 66 | 91 | ||
3100 | 92 | <<<<<<< po/bem.po | ||
3101 | 67 | #: ../data/apt_check.py:137 | 93 | #: ../data/apt_check.py:137 |
3102 | 68 | msgid "Enable UA Infra: ESM to receive additional future security updates." | 94 | msgid "Enable UA Infra: ESM to receive additional future security updates." |
3103 | 69 | msgstr "" | 95 | msgstr "" |
3104 | @@ -73,19 +99,39 @@ msgid "See https://ubuntu.com/security/esm or run: sudo ua status" | |||
3105 | 73 | msgstr "" | 99 | msgstr "" |
3106 | 74 | 100 | ||
3107 | 75 | #: ../data/apt_check.py:184 | 101 | #: ../data/apt_check.py:184 |
3108 | 102 | ======= | ||
3109 | 103 | #: ../data/apt_check.py:135 | ||
3110 | 104 | msgid "Enable UA Infra: ESM to receive additional future security updates." | ||
3111 | 105 | msgstr "" | ||
3112 | 106 | |||
3113 | 107 | #: ../data/apt_check.py:140 | ||
3114 | 108 | msgid "See https://ubuntu.com/security/esm or run: sudo ua status" | ||
3115 | 109 | msgstr "" | ||
3116 | 110 | |||
3117 | 111 | #: ../data/apt_check.py:182 | ||
3118 | 112 | >>>>>>> po/bem.po | ||
3119 | 76 | #, python-format | 113 | #, python-format |
3120 | 77 | msgid "Error: Opening the cache (%s)" | 114 | msgid "Error: Opening the cache (%s)" |
3121 | 78 | msgstr "" | 115 | msgstr "" |
3122 | 79 | 116 | ||
3123 | 117 | <<<<<<< po/bem.po | ||
3124 | 80 | #: ../data/apt_check.py:194 | 118 | #: ../data/apt_check.py:194 |
3125 | 81 | msgid "Error: BrokenCount > 0" | 119 | msgid "Error: BrokenCount > 0" |
3126 | 82 | msgstr "" | 120 | msgstr "" |
3127 | 83 | 121 | ||
3128 | 84 | #: ../data/apt_check.py:201 | 122 | #: ../data/apt_check.py:201 |
3129 | 123 | ======= | ||
3130 | 124 | #: ../data/apt_check.py:192 | ||
3131 | 125 | msgid "Error: BrokenCount > 0" | ||
3132 | 126 | msgstr "" | ||
3133 | 127 | |||
3134 | 128 | #: ../data/apt_check.py:199 | ||
3135 | 129 | >>>>>>> po/bem.po | ||
3136 | 85 | #, python-format | 130 | #, python-format |
3137 | 86 | msgid "Error: Marking the upgrade (%s)" | 131 | msgid "Error: Marking the upgrade (%s)" |
3138 | 87 | msgstr "" | 132 | msgstr "" |
3139 | 88 | 133 | ||
3140 | 134 | <<<<<<< po/bem.po | ||
3141 | 89 | #: ../data/apt_check.py:310 | 135 | #: ../data/apt_check.py:310 |
3142 | 90 | msgid "Show the packages that are going to be installed/upgraded" | 136 | msgid "Show the packages that are going to be installed/upgraded" |
3143 | 91 | msgstr "" | 137 | msgstr "" |
3144 | @@ -95,6 +141,17 @@ msgid "Show human readable output on stdout" | |||
3145 | 95 | msgstr "" | 141 | msgstr "" |
3146 | 96 | 142 | ||
3147 | 97 | #: ../data/apt_check.py:320 | 143 | #: ../data/apt_check.py:320 |
3148 | 144 | ======= | ||
3149 | 145 | #: ../data/apt_check.py:309 | ||
3150 | 146 | msgid "Show the packages that are going to be installed/upgraded" | ||
3151 | 147 | msgstr "" | ||
3152 | 148 | |||
3153 | 149 | #: ../data/apt_check.py:315 | ||
3154 | 150 | msgid "Show human readable output on stdout" | ||
3155 | 151 | msgstr "" | ||
3156 | 152 | |||
3157 | 153 | #: ../data/apt_check.py:319 | ||
3158 | 154 | >>>>>>> po/bem.po | ||
3159 | 98 | msgid "" | 155 | msgid "" |
3160 | 99 | "Return the time in days when security updates are installed unattended (0 " | 156 | "Return the time in days when security updates are installed unattended (0 " |
3161 | 100 | "means disabled)" | 157 | "means disabled)" |
3162 | @@ -122,6 +179,21 @@ msgid "" | |||
3163 | 122 | "notification icon to display details. " | 179 | "notification icon to display details. " |
3164 | 123 | msgstr "" | 180 | msgstr "" |
3165 | 124 | 181 | ||
3166 | 182 | <<<<<<< po/bem.po | ||
3167 | 183 | ======= | ||
3168 | 184 | #. Create and show the notification | ||
3169 | 185 | #: ../src/avahi.c:16 | ||
3170 | 186 | msgid "Network service discovery disabled" | ||
3171 | 187 | msgstr "" | ||
3172 | 188 | |||
3173 | 189 | #: ../src/avahi.c:17 | ||
3174 | 190 | msgid "" | ||
3175 | 191 | "Your current network has a .local domain, which is not recommended and " | ||
3176 | 192 | "incompatible with the Avahi network service discovery. The service has been " | ||
3177 | 193 | "disabled." | ||
3178 | 194 | msgstr "" | ||
3179 | 195 | |||
3180 | 196 | >>>>>>> po/bem.po | ||
3181 | 125 | #: ../src/cdroms.c:48 | 197 | #: ../src/cdroms.c:48 |
3182 | 126 | msgid "Software Packages Volume Detected" | 198 | msgid "Software Packages Volume Detected" |
3183 | 127 | msgstr "" | 199 | msgstr "" |
3184 | @@ -203,9 +275,14 @@ msgid "No current updates" | |||
3185 | 203 | msgstr "" | 275 | msgstr "" |
3186 | 204 | 276 | ||
3187 | 205 | #: ../src/livepatch-tray.c:148 | 277 | #: ../src/livepatch-tray.c:148 |
3188 | 278 | <<<<<<< po/bem.po | ||
3189 | 206 | #, c-format | 279 | #, c-format |
3190 | 207 | msgid "%zd current update" | 280 | msgid "%zd current update" |
3191 | 208 | msgid_plural "%zd current updates" | 281 | msgid_plural "%zd current updates" |
3192 | 282 | ======= | ||
3193 | 283 | msgid "%" | ||
3194 | 284 | msgid_plural "%" | ||
3195 | 285 | >>>>>>> po/bem.po | ||
3196 | 209 | msgstr[0] "" | 286 | msgstr[0] "" |
3197 | 210 | msgstr[1] "" | 287 | msgstr[1] "" |
3198 | 211 | 288 | ||
3199 | @@ -290,20 +367,36 @@ msgstr "" | |||
3200 | 290 | msgid "A problem occurred when checking for the updates." | 367 | msgid "A problem occurred when checking for the updates." |
3201 | 291 | msgstr "" | 368 | msgstr "" |
3202 | 292 | 369 | ||
3203 | 370 | <<<<<<< po/bem.po | ||
3204 | 293 | #: ../src/update-notifier.c:560 | 371 | #: ../src/update-notifier.c:560 |
3205 | 294 | msgid "- inform about updates" | 372 | msgid "- inform about updates" |
3206 | 295 | msgstr "" | 373 | msgstr "" |
3207 | 296 | 374 | ||
3208 | 297 | #: ../src/update-notifier.c:562 | 375 | #: ../src/update-notifier.c:562 |
3209 | 376 | ======= | ||
3210 | 377 | #: ../src/update-notifier.c:585 | ||
3211 | 378 | msgid "- inform about updates" | ||
3212 | 379 | msgstr "" | ||
3213 | 380 | |||
3214 | 381 | #: ../src/update-notifier.c:587 | ||
3215 | 382 | >>>>>>> po/bem.po | ||
3216 | 298 | #, c-format | 383 | #, c-format |
3217 | 299 | msgid "Failed to init the UI: %s\n" | 384 | msgid "Failed to init the UI: %s\n" |
3218 | 300 | msgstr "" | 385 | msgstr "" |
3219 | 301 | 386 | ||
3220 | 387 | <<<<<<< po/bem.po | ||
3221 | 302 | #: ../src/update-notifier.c:563 | 388 | #: ../src/update-notifier.c:563 |
3222 | 303 | msgid "unknown error" | 389 | msgid "unknown error" |
3223 | 304 | msgstr "" | 390 | msgstr "" |
3224 | 305 | 391 | ||
3225 | 306 | #: ../src/update-notifier.c:590 | 392 | #: ../src/update-notifier.c:590 |
3226 | 393 | ======= | ||
3227 | 394 | #: ../src/update-notifier.c:588 | ||
3228 | 395 | msgid "unknown error" | ||
3229 | 396 | msgstr "" | ||
3230 | 397 | |||
3231 | 398 | #: ../src/update-notifier.c:615 | ||
3232 | 399 | >>>>>>> po/bem.po | ||
3233 | 307 | msgid "update-notifier" | 400 | msgid "update-notifier" |
3234 | 308 | msgstr "" | 401 | msgstr "" |
3235 | 309 | 402 | ||
3236 | diff --git a/po/bg.po b/po/bg.po | |||
3237 | index 467a410..107ab2d 100644 | |||
3238 | --- a/po/bg.po | |||
3239 | +++ b/po/bg.po | |||
3240 | @@ -7,7 +7,11 @@ msgid "" | |||
3241 | 7 | msgstr "" | 7 | msgstr "" |
3242 | 8 | "Project-Id-Version: update-notifier\n" | 8 | "Project-Id-Version: update-notifier\n" |
3243 | 9 | "Report-Msgid-Bugs-To: \n" | 9 | "Report-Msgid-Bugs-To: \n" |
3244 | 10 | <<<<<<< po/bg.po | ||
3245 | 10 | "POT-Creation-Date: 2020-11-12 23:53+0000\n" | 11 | "POT-Creation-Date: 2020-11-12 23:53+0000\n" |
3246 | 12 | ======= | ||
3247 | 13 | "POT-Creation-Date: 2020-11-19 05:20+0000\n" | ||
3248 | 14 | >>>>>>> po/bg.po | ||
3249 | 11 | "PO-Revision-Date: 2013-03-12 10:57+0000\n" | 15 | "PO-Revision-Date: 2013-03-12 10:57+0000\n" |
3250 | 12 | "Last-Translator: Atanas Kovachki <Unknown>\n" | 16 | "Last-Translator: Atanas Kovachki <Unknown>\n" |
3251 | 13 | "Language-Team: Bulgarian <bg@li.org>\n" | 17 | "Language-Team: Bulgarian <bg@li.org>\n" |
3252 | @@ -33,6 +37,7 @@ msgid "UA Infra: Extended Security Maintenance (ESM) is not enabled." | |||
3253 | 33 | msgstr "" | 37 | msgstr "" |
3254 | 34 | 38 | ||
3255 | 35 | #: ../data/apt_check.py:93 | 39 | #: ../data/apt_check.py:93 |
3256 | 40 | <<<<<<< po/bg.po | ||
3257 | 36 | #, fuzzy, python-format | 41 | #, fuzzy, python-format |
3258 | 37 | msgid "%i update can be installed immediately." | 42 | msgid "%i update can be installed immediately." |
3259 | 38 | msgid_plural "%i updates can be installed immediately." | 43 | msgid_plural "%i updates can be installed immediately." |
3260 | @@ -40,30 +45,52 @@ msgstr[0] "%i актуализация за сигурността." | |||
3261 | 40 | msgstr[1] "%i актуализации за сигурността." | 45 | msgstr[1] "%i актуализации за сигурността." |
3262 | 41 | 46 | ||
3263 | 42 | #: ../data/apt_check.py:101 | 47 | #: ../data/apt_check.py:101 |
3264 | 48 | ======= | ||
3265 | 49 | #, python-format | ||
3266 | 50 | msgid "%i package can be updated." | ||
3267 | 51 | msgid_plural "%i packages can be updated." | ||
3268 | 52 | msgstr[0] "%i пакет може да бъде актуализиран." | ||
3269 | 53 | msgstr[1] "%i пакета могат да бъдат актуализирани." | ||
3270 | 54 | |||
3271 | 55 | #: ../data/apt_check.py:99 | ||
3272 | 56 | >>>>>>> po/bg.po | ||
3273 | 43 | #, python-format | 57 | #, python-format |
3274 | 44 | msgid "%i of these updates is fixed through UA Infra: ESM." | 58 | msgid "%i of these updates is fixed through UA Infra: ESM." |
3275 | 45 | msgid_plural "%i of these updates are fixed through UA Infra: ESM." | 59 | msgid_plural "%i of these updates are fixed through UA Infra: ESM." |
3276 | 46 | msgstr[0] "" | 60 | msgstr[0] "" |
3277 | 47 | msgstr[1] "" | 61 | msgstr[1] "" |
3278 | 48 | 62 | ||
3279 | 63 | <<<<<<< po/bg.po | ||
3280 | 49 | #: ../data/apt_check.py:110 | 64 | #: ../data/apt_check.py:110 |
3281 | 65 | ======= | ||
3282 | 66 | #: ../data/apt_check.py:108 | ||
3283 | 67 | >>>>>>> po/bg.po | ||
3284 | 50 | #, fuzzy, python-format | 68 | #, fuzzy, python-format |
3285 | 51 | msgid "%i of these updates is a security update." | 69 | msgid "%i of these updates is a security update." |
3286 | 52 | msgid_plural "%i of these updates are security updates." | 70 | msgid_plural "%i of these updates are security updates." |
3287 | 53 | msgstr[0] "%i актуализация за сигурността." | 71 | msgstr[0] "%i актуализация за сигурността." |
3288 | 54 | msgstr[1] "%i актуализации за сигурността." | 72 | msgstr[1] "%i актуализации за сигурността." |
3289 | 55 | 73 | ||
3290 | 74 | <<<<<<< po/bg.po | ||
3291 | 56 | #: ../data/apt_check.py:119 | 75 | #: ../data/apt_check.py:119 |
3292 | 57 | msgid "To see these additional updates run: apt list --upgradable" | 76 | msgid "To see these additional updates run: apt list --upgradable" |
3293 | 58 | msgstr "" | 77 | msgstr "" |
3294 | 59 | 78 | ||
3295 | 60 | #: ../data/apt_check.py:126 | 79 | #: ../data/apt_check.py:126 |
3296 | 80 | ======= | ||
3297 | 81 | #: ../data/apt_check.py:117 | ||
3298 | 82 | msgid "To see these additional updates run: apt list --upgradable" | ||
3299 | 83 | msgstr "" | ||
3300 | 84 | |||
3301 | 85 | #: ../data/apt_check.py:124 | ||
3302 | 86 | >>>>>>> po/bg.po | ||
3303 | 61 | #, python-format | 87 | #, python-format |
3304 | 62 | msgid "Enable UA Infra: ESM to receive %i additional security update." | 88 | msgid "Enable UA Infra: ESM to receive %i additional security update." |
3305 | 63 | msgid_plural "Enable UA Infra: ESM to receive %i additional security updates." | 89 | msgid_plural "Enable UA Infra: ESM to receive %i additional security updates." |
3306 | 64 | msgstr[0] "" | 90 | msgstr[0] "" |
3307 | 65 | msgstr[1] "" | 91 | msgstr[1] "" |
3308 | 66 | 92 | ||
3309 | 93 | <<<<<<< po/bg.po | ||
3310 | 67 | #: ../data/apt_check.py:137 | 94 | #: ../data/apt_check.py:137 |
3311 | 68 | msgid "Enable UA Infra: ESM to receive additional future security updates." | 95 | msgid "Enable UA Infra: ESM to receive additional future security updates." |
3312 | 69 | msgstr "" | 96 | msgstr "" |
3313 | @@ -73,19 +100,39 @@ msgid "See https://ubuntu.com/security/esm or run: sudo ua status" | |||
3314 | 73 | msgstr "" | 100 | msgstr "" |
3315 | 74 | 101 | ||
3316 | 75 | #: ../data/apt_check.py:184 | 102 | #: ../data/apt_check.py:184 |
3317 | 103 | ======= | ||
3318 | 104 | #: ../data/apt_check.py:135 | ||
3319 | 105 | msgid "Enable UA Infra: ESM to receive additional future security updates." | ||
3320 | 106 | msgstr "" | ||
3321 | 107 | |||
3322 | 108 | #: ../data/apt_check.py:140 | ||
3323 | 109 | msgid "See https://ubuntu.com/security/esm or run: sudo ua status" | ||
3324 | 110 | msgstr "" | ||
3325 | 111 | |||
3326 | 112 | #: ../data/apt_check.py:182 | ||
3327 | 113 | >>>>>>> po/bg.po | ||
3328 | 76 | #, python-format | 114 | #, python-format |
3329 | 77 | msgid "Error: Opening the cache (%s)" | 115 | msgid "Error: Opening the cache (%s)" |
3330 | 78 | msgstr "Грешка: Отваряне на кеша (%s)" | 116 | msgstr "Грешка: Отваряне на кеша (%s)" |
3331 | 79 | 117 | ||
3332 | 118 | <<<<<<< po/bg.po | ||
3333 | 80 | #: ../data/apt_check.py:194 | 119 | #: ../data/apt_check.py:194 |
3334 | 81 | msgid "Error: BrokenCount > 0" | 120 | msgid "Error: BrokenCount > 0" |
3335 | 82 | msgstr "Грешка: BrokenCount > 0" | 121 | msgstr "Грешка: BrokenCount > 0" |
3336 | 83 | 122 | ||
3337 | 84 | #: ../data/apt_check.py:201 | 123 | #: ../data/apt_check.py:201 |
3338 | 124 | ======= | ||
3339 | 125 | #: ../data/apt_check.py:192 | ||
3340 | 126 | msgid "Error: BrokenCount > 0" | ||
3341 | 127 | msgstr "Грешка: BrokenCount > 0" | ||
3342 | 128 | |||
3343 | 129 | #: ../data/apt_check.py:199 | ||
3344 | 130 | >>>>>>> po/bg.po | ||
3345 | 85 | #, python-format | 131 | #, python-format |
3346 | 86 | msgid "Error: Marking the upgrade (%s)" | 132 | msgid "Error: Marking the upgrade (%s)" |
3347 | 87 | msgstr "Грешка: Маркиране на надграждане (%s)" | 133 | msgstr "Грешка: Маркиране на надграждане (%s)" |
3348 | 88 | 134 | ||
3349 | 135 | <<<<<<< po/bg.po | ||
3350 | 89 | #: ../data/apt_check.py:310 | 136 | #: ../data/apt_check.py:310 |
3351 | 90 | msgid "Show the packages that are going to be installed/upgraded" | 137 | msgid "Show the packages that are going to be installed/upgraded" |
3352 | 91 | msgstr "Показване на пакетите, които ще бъдат инсталирани/надградени" | 138 | msgstr "Показване на пакетите, които ще бъдат инсталирани/надградени" |
3353 | @@ -95,6 +142,17 @@ msgid "Show human readable output on stdout" | |||
3354 | 95 | msgstr "Показване на четим език изходният текст на stdout" | 142 | msgstr "Показване на четим език изходният текст на stdout" |
3355 | 96 | 143 | ||
3356 | 97 | #: ../data/apt_check.py:320 | 144 | #: ../data/apt_check.py:320 |
3357 | 145 | ======= | ||
3358 | 146 | #: ../data/apt_check.py:309 | ||
3359 | 147 | msgid "Show the packages that are going to be installed/upgraded" | ||
3360 | 148 | msgstr "Показване на пакетите, които ще бъдат инсталирани/надградени" | ||
3361 | 149 | |||
3362 | 150 | #: ../data/apt_check.py:315 | ||
3363 | 151 | msgid "Show human readable output on stdout" | ||
3364 | 152 | msgstr "Показване на четим език изходният текст на stdout" | ||
3365 | 153 | |||
3366 | 154 | #: ../data/apt_check.py:319 | ||
3367 | 155 | >>>>>>> po/bg.po | ||
3368 | 98 | msgid "" | 156 | msgid "" |
3369 | 99 | "Return the time in days when security updates are installed unattended (0 " | 157 | "Return the time in days when security updates are installed unattended (0 " |
3370 | 100 | "means disabled)" | 158 | "means disabled)" |
3371 | @@ -126,6 +184,23 @@ msgstr "" | |||
3372 | 126 | "Имало е срив в някоя програма (сега или преди време). Натиснете върху " | 184 | "Имало е срив в някоя програма (сега или преди време). Натиснете върху " |
3373 | 127 | "иконата, за да видите подробности. " | 185 | "иконата, за да видите подробности. " |
3374 | 128 | 186 | ||
3375 | 187 | <<<<<<< po/bg.po | ||
3376 | 188 | ======= | ||
3377 | 189 | #. Create and show the notification | ||
3378 | 190 | #: ../src/avahi.c:16 | ||
3379 | 191 | msgid "Network service discovery disabled" | ||
3380 | 192 | msgstr "Откриването на мрежови услуги забранено" | ||
3381 | 193 | |||
3382 | 194 | #: ../src/avahi.c:17 | ||
3383 | 195 | msgid "" | ||
3384 | 196 | "Your current network has a .local domain, which is not recommended and " | ||
3385 | 197 | "incompatible with the Avahi network service discovery. The service has been " | ||
3386 | 198 | "disabled." | ||
3387 | 199 | msgstr "" | ||
3388 | 200 | "Вашата текуща мрежа има .local домейн, което не е препоръчително и " | ||
3389 | 201 | "несъвместимо с услугата за откриване на мрежа Avahi. Услугата беше изключена." | ||
3390 | 202 | |||
3391 | 203 | >>>>>>> po/bg.po | ||
3392 | 129 | #: ../src/cdroms.c:48 | 204 | #: ../src/cdroms.c:48 |
3393 | 130 | msgid "Software Packages Volume Detected" | 205 | msgid "Software Packages Volume Detected" |
3394 | 131 | msgstr "Открит е носител със софтуерни пакети" | 206 | msgstr "Открит е носител със софтуерни пакети" |
3395 | @@ -220,9 +295,14 @@ msgid "No current updates" | |||
3396 | 220 | msgstr "- информиране за актуализации" | 295 | msgstr "- информиране за актуализации" |
3397 | 221 | 296 | ||
3398 | 222 | #: ../src/livepatch-tray.c:148 | 297 | #: ../src/livepatch-tray.c:148 |
3399 | 298 | <<<<<<< po/bg.po | ||
3400 | 223 | #, c-format | 299 | #, c-format |
3401 | 224 | msgid "%zd current update" | 300 | msgid "%zd current update" |
3402 | 225 | msgid_plural "%zd current updates" | 301 | msgid_plural "%zd current updates" |
3403 | 302 | ======= | ||
3404 | 303 | msgid "%" | ||
3405 | 304 | msgid_plural "%" | ||
3406 | 305 | >>>>>>> po/bg.po | ||
3407 | 226 | msgstr[0] "" | 306 | msgstr[0] "" |
3408 | 227 | msgstr[1] "" | 307 | msgstr[1] "" |
3409 | 228 | 308 | ||
3410 | @@ -326,20 +406,36 @@ msgstr "" | |||
3411 | 326 | msgid "A problem occurred when checking for the updates." | 406 | msgid "A problem occurred when checking for the updates." |
3412 | 327 | msgstr "Възникна проблем при проверка за актуализации." | 407 | msgstr "Възникна проблем при проверка за актуализации." |
3413 | 328 | 408 | ||
3414 | 409 | <<<<<<< po/bg.po | ||
3415 | 329 | #: ../src/update-notifier.c:560 | 410 | #: ../src/update-notifier.c:560 |
3416 | 330 | msgid "- inform about updates" | 411 | msgid "- inform about updates" |
3417 | 331 | msgstr "- информиране за актуализации" | 412 | msgstr "- информиране за актуализации" |
3418 | 332 | 413 | ||
3419 | 333 | #: ../src/update-notifier.c:562 | 414 | #: ../src/update-notifier.c:562 |
3420 | 415 | ======= | ||
3421 | 416 | #: ../src/update-notifier.c:585 | ||
3422 | 417 | msgid "- inform about updates" | ||
3423 | 418 | msgstr "- информиране за актуализации" | ||
3424 | 419 | |||
3425 | 420 | #: ../src/update-notifier.c:587 | ||
3426 | 421 | >>>>>>> po/bg.po | ||
3427 | 334 | #, c-format | 422 | #, c-format |
3428 | 335 | msgid "Failed to init the UI: %s\n" | 423 | msgid "Failed to init the UI: %s\n" |
3429 | 336 | msgstr "Неуспешен опит за инициализиране на потребителския интерфейс: %s\n" | 424 | msgstr "Неуспешен опит за инициализиране на потребителския интерфейс: %s\n" |
3430 | 337 | 425 | ||
3431 | 426 | <<<<<<< po/bg.po | ||
3432 | 338 | #: ../src/update-notifier.c:563 | 427 | #: ../src/update-notifier.c:563 |
3433 | 339 | msgid "unknown error" | 428 | msgid "unknown error" |
3434 | 340 | msgstr "неизвестна грешка" | 429 | msgstr "неизвестна грешка" |
3435 | 341 | 430 | ||
3436 | 342 | #: ../src/update-notifier.c:590 | 431 | #: ../src/update-notifier.c:590 |
3437 | 432 | ======= | ||
3438 | 433 | #: ../src/update-notifier.c:588 | ||
3439 | 434 | msgid "unknown error" | ||
3440 | 435 | msgstr "неизвестна грешка" | ||
3441 | 436 | |||
3442 | 437 | #: ../src/update-notifier.c:615 | ||
3443 | 438 | >>>>>>> po/bg.po | ||
3444 | 343 | msgid "update-notifier" | 439 | msgid "update-notifier" |
3445 | 344 | msgstr "известяване за актуализации" | 440 | msgstr "известяване за актуализации" |
3446 | 345 | 441 | ||
3447 | @@ -412,11 +508,14 @@ msgstr "" | |||
3448 | 412 | "след това за да оправите проблема, трябва да изтриете и да изпълните ново " | 508 | "след това за да оправите проблема, трябва да изтриете и да изпълните ново " |
3449 | 413 | "инсталиране на пакетите." | 509 | "инсталиране на пакетите." |
3450 | 414 | 510 | ||
3451 | 511 | <<<<<<< po/bg.po | ||
3452 | 415 | #~ msgid "%i package can be updated." | 512 | #~ msgid "%i package can be updated." |
3453 | 416 | #~ msgid_plural "%i packages can be updated." | 513 | #~ msgid_plural "%i packages can be updated." |
3454 | 417 | #~ msgstr[0] "%i пакет може да бъде актуализиран." | 514 | #~ msgstr[0] "%i пакет може да бъде актуализиран." |
3455 | 418 | #~ msgstr[1] "%i пакета могат да бъдат актуализирани." | 515 | #~ msgstr[1] "%i пакета могат да бъдат актуализирани." |
3456 | 419 | 516 | ||
3457 | 517 | ======= | ||
3458 | 518 | >>>>>>> po/bg.po | ||
3459 | 420 | #~ msgid "" | 519 | #~ msgid "" |
3460 | 421 | #~ "<span weight=\"bold\" size=\"larger\">Please enter your password to " | 520 | #~ "<span weight=\"bold\" size=\"larger\">Please enter your password to " |
3461 | 422 | #~ "access problem reports of system programs</span>" | 521 | #~ "access problem reports of system programs</span>" |
3462 | @@ -424,6 +523,7 @@ msgstr "" | |||
3463 | 424 | #~ "<span weight=\"bold\" size=\"larger\">Моля, въведете паролата си за да " | 523 | #~ "<span weight=\"bold\" size=\"larger\">Моля, въведете паролата си за да " |
3464 | 425 | #~ "достъпите докладите за проблеми със системни програми</span>" | 524 | #~ "достъпите докладите за проблеми със системни програми</span>" |
3465 | 426 | 525 | ||
3466 | 526 | <<<<<<< po/bg.po | ||
3467 | 427 | #~ msgid "Network service discovery disabled" | 527 | #~ msgid "Network service discovery disabled" |
3468 | 428 | #~ msgstr "Откриването на мрежови услуги забранено" | 528 | #~ msgstr "Откриването на мрежови услуги забранено" |
3469 | 429 | 529 | ||
3470 | @@ -436,6 +536,8 @@ msgstr "" | |||
3471 | 436 | #~ "несъвместимо с услугата за откриване на мрежа Avahi. Услугата беше " | 536 | #~ "несъвместимо с услугата за откриване на мрежа Avahi. Услугата беше " |
3472 | 437 | #~ "изключена." | 537 | #~ "изключена." |
3473 | 438 | 538 | ||
3474 | 539 | ======= | ||
3475 | 540 | >>>>>>> po/bg.po | ||
3476 | 439 | #~ msgid "Addon volume detected" | 541 | #~ msgid "Addon volume detected" |
3477 | 440 | #~ msgstr "Открит е носител с допълнения" | 542 | #~ msgstr "Открит е носител с допълнения" |
3478 | 441 | 543 | ||
3479 | diff --git a/po/bn.po b/po/bn.po | |||
3480 | index f502bec..c6cb3b6 100644 | |||
3481 | --- a/po/bn.po | |||
3482 | +++ b/po/bn.po | |||
3483 | @@ -7,7 +7,11 @@ msgid "" | |||
3484 | 7 | msgstr "" | 7 | msgstr "" |
3485 | 8 | "Project-Id-Version: update-notifier\n" | 8 | "Project-Id-Version: update-notifier\n" |
3486 | 9 | "Report-Msgid-Bugs-To: \n" | 9 | "Report-Msgid-Bugs-To: \n" |
3487 | 10 | <<<<<<< po/bn.po | ||
3488 | 10 | "POT-Creation-Date: 2020-11-12 23:53+0000\n" | 11 | "POT-Creation-Date: 2020-11-12 23:53+0000\n" |
3489 | 12 | ======= | ||
3490 | 13 | "POT-Creation-Date: 2020-11-19 05:20+0000\n" | ||
3491 | 14 | >>>>>>> po/bn.po | ||
3492 | 11 | "PO-Revision-Date: 2012-04-16 11:22+0000\n" | 15 | "PO-Revision-Date: 2012-04-16 11:22+0000\n" |
3493 | 12 | "Last-Translator: Robin Mehdee <Unknown>\n" | 16 | "Last-Translator: Robin Mehdee <Unknown>\n" |
3494 | 13 | "Language-Team: Bengali <ankur-bd-l10n@googlegroups.com>\n" | 17 | "Language-Team: Bengali <ankur-bd-l10n@googlegroups.com>\n" |
3495 | @@ -34,6 +38,7 @@ msgid "UA Infra: Extended Security Maintenance (ESM) is not enabled." | |||
3496 | 34 | msgstr "" | 38 | msgstr "" |
3497 | 35 | 39 | ||
3498 | 36 | #: ../data/apt_check.py:93 | 40 | #: ../data/apt_check.py:93 |
3499 | 41 | <<<<<<< po/bn.po | ||
3500 | 37 | #, fuzzy, python-format | 42 | #, fuzzy, python-format |
3501 | 38 | msgid "%i update can be installed immediately." | 43 | msgid "%i update can be installed immediately." |
3502 | 39 | msgid_plural "%i updates can be installed immediately." | 44 | msgid_plural "%i updates can be installed immediately." |
3503 | @@ -41,30 +46,52 @@ msgstr[0] "%i হল নিরাপত্তা হালনাগাদ" | |||
3504 | 41 | msgstr[1] "%i হল নিরাপত্তা আপডেট" | 46 | msgstr[1] "%i হল নিরাপত্তা আপডেট" |
3505 | 42 | 47 | ||
3506 | 43 | #: ../data/apt_check.py:101 | 48 | #: ../data/apt_check.py:101 |
3507 | 49 | ======= | ||
3508 | 50 | #, python-format | ||
3509 | 51 | msgid "%i package can be updated." | ||
3510 | 52 | msgid_plural "%i packages can be updated." | ||
3511 | 53 | msgstr[0] "%i প্যাকেজ হালনাগাদ করা সম্ভব" | ||
3512 | 54 | msgstr[1] "%i প্যাকেজ হালনাগাদ করা সম্ভব" | ||
3513 | 55 | |||
3514 | 56 | #: ../data/apt_check.py:99 | ||
3515 | 57 | >>>>>>> po/bn.po | ||
3516 | 44 | #, python-format | 58 | #, python-format |
3517 | 45 | msgid "%i of these updates is fixed through UA Infra: ESM." | 59 | msgid "%i of these updates is fixed through UA Infra: ESM." |
3518 | 46 | msgid_plural "%i of these updates are fixed through UA Infra: ESM." | 60 | msgid_plural "%i of these updates are fixed through UA Infra: ESM." |
3519 | 47 | msgstr[0] "" | 61 | msgstr[0] "" |
3520 | 48 | msgstr[1] "" | 62 | msgstr[1] "" |
3521 | 49 | 63 | ||
3522 | 64 | <<<<<<< po/bn.po | ||
3523 | 50 | #: ../data/apt_check.py:110 | 65 | #: ../data/apt_check.py:110 |
3524 | 66 | ======= | ||
3525 | 67 | #: ../data/apt_check.py:108 | ||
3526 | 68 | >>>>>>> po/bn.po | ||
3527 | 51 | #, fuzzy, python-format | 69 | #, fuzzy, python-format |
3528 | 52 | msgid "%i of these updates is a security update." | 70 | msgid "%i of these updates is a security update." |
3529 | 53 | msgid_plural "%i of these updates are security updates." | 71 | msgid_plural "%i of these updates are security updates." |
3530 | 54 | msgstr[0] "%i হল নিরাপত্তা হালনাগাদ" | 72 | msgstr[0] "%i হল নিরাপত্তা হালনাগাদ" |
3531 | 55 | msgstr[1] "%i হল নিরাপত্তা আপডেট" | 73 | msgstr[1] "%i হল নিরাপত্তা আপডেট" |
3532 | 56 | 74 | ||
3533 | 75 | <<<<<<< po/bn.po | ||
3534 | 57 | #: ../data/apt_check.py:119 | 76 | #: ../data/apt_check.py:119 |
3535 | 58 | msgid "To see these additional updates run: apt list --upgradable" | 77 | msgid "To see these additional updates run: apt list --upgradable" |
3536 | 59 | msgstr "" | 78 | msgstr "" |
3537 | 60 | 79 | ||
3538 | 61 | #: ../data/apt_check.py:126 | 80 | #: ../data/apt_check.py:126 |
3539 | 81 | ======= | ||
3540 | 82 | #: ../data/apt_check.py:117 | ||
3541 | 83 | msgid "To see these additional updates run: apt list --upgradable" | ||
3542 | 84 | msgstr "" | ||
3543 | 85 | |||
3544 | 86 | #: ../data/apt_check.py:124 | ||
3545 | 87 | >>>>>>> po/bn.po | ||
3546 | 62 | #, python-format | 88 | #, python-format |
3547 | 63 | msgid "Enable UA Infra: ESM to receive %i additional security update." | 89 | msgid "Enable UA Infra: ESM to receive %i additional security update." |
3548 | 64 | msgid_plural "Enable UA Infra: ESM to receive %i additional security updates." | 90 | msgid_plural "Enable UA Infra: ESM to receive %i additional security updates." |
3549 | 65 | msgstr[0] "" | 91 | msgstr[0] "" |
3550 | 66 | msgstr[1] "" | 92 | msgstr[1] "" |
3551 | 67 | 93 | ||
3552 | 94 | <<<<<<< po/bn.po | ||
3553 | 68 | #: ../data/apt_check.py:137 | 95 | #: ../data/apt_check.py:137 |
3554 | 69 | msgid "Enable UA Infra: ESM to receive additional future security updates." | 96 | msgid "Enable UA Infra: ESM to receive additional future security updates." |
3555 | 70 | msgstr "" | 97 | msgstr "" |
3556 | @@ -74,19 +101,39 @@ msgid "See https://ubuntu.com/security/esm or run: sudo ua status" | |||
3557 | 74 | msgstr "" | 101 | msgstr "" |
3558 | 75 | 102 | ||
3559 | 76 | #: ../data/apt_check.py:184 | 103 | #: ../data/apt_check.py:184 |
3560 | 104 | ======= | ||
3561 | 105 | #: ../data/apt_check.py:135 | ||
3562 | 106 | msgid "Enable UA Infra: ESM to receive additional future security updates." | ||
3563 | 107 | msgstr "" | ||
3564 | 108 | |||
3565 | 109 | #: ../data/apt_check.py:140 | ||
3566 | 110 | msgid "See https://ubuntu.com/security/esm or run: sudo ua status" | ||
3567 | 111 | msgstr "" | ||
3568 | 112 | |||
3569 | 113 | #: ../data/apt_check.py:182 | ||
3570 | 114 | >>>>>>> po/bn.po | ||
3571 | 77 | #, python-format | 115 | #, python-format |
3572 | 78 | msgid "Error: Opening the cache (%s)" | 116 | msgid "Error: Opening the cache (%s)" |
3573 | 79 | msgstr "ত্রুটি: ক্যাশ খোলা হচ্ছে (%s)" | 117 | msgstr "ত্রুটি: ক্যাশ খোলা হচ্ছে (%s)" |
3574 | 80 | 118 | ||
3575 | 119 | <<<<<<< po/bn.po | ||
3576 | 81 | #: ../data/apt_check.py:194 | 120 | #: ../data/apt_check.py:194 |
3577 | 82 | msgid "Error: BrokenCount > 0" | 121 | msgid "Error: BrokenCount > 0" |
3578 | 83 | msgstr "ত্রুটি: BrokenCount > 0" | 122 | msgstr "ত্রুটি: BrokenCount > 0" |
3579 | 84 | 123 | ||
3580 | 85 | #: ../data/apt_check.py:201 | 124 | #: ../data/apt_check.py:201 |
3581 | 125 | ======= | ||
3582 | 126 | #: ../data/apt_check.py:192 | ||
3583 | 127 | msgid "Error: BrokenCount > 0" | ||
3584 | 128 | msgstr "ত্রুটি: BrokenCount > 0" | ||
3585 | 129 | |||
3586 | 130 | #: ../data/apt_check.py:199 | ||
3587 | 131 | >>>>>>> po/bn.po | ||
3588 | 86 | #, python-format | 132 | #, python-format |
3589 | 87 | msgid "Error: Marking the upgrade (%s)" | 133 | msgid "Error: Marking the upgrade (%s)" |
3590 | 88 | msgstr "ত্রুটি: আপগ্রেড চিহ্নিত করা হচ্ছে (%s)" | 134 | msgstr "ত্রুটি: আপগ্রেড চিহ্নিত করা হচ্ছে (%s)" |
3591 | 89 | 135 | ||
3592 | 136 | <<<<<<< po/bn.po | ||
3593 | 90 | #: ../data/apt_check.py:310 | 137 | #: ../data/apt_check.py:310 |
3594 | 91 | msgid "Show the packages that are going to be installed/upgraded" | 138 | msgid "Show the packages that are going to be installed/upgraded" |
3595 | 92 | msgstr "ইনস্টল/ আপগ্রেড করা হবে এমন প্যাকেজগুলি দেখানো হবে" | 139 | msgstr "ইনস্টল/ আপগ্রেড করা হবে এমন প্যাকেজগুলি দেখানো হবে" |
3596 | @@ -96,6 +143,17 @@ msgid "Show human readable output on stdout" | |||
3597 | 96 | msgstr "stdout এর উপর" | 143 | msgstr "stdout এর উপর" |
3598 | 97 | 144 | ||
3599 | 98 | #: ../data/apt_check.py:320 | 145 | #: ../data/apt_check.py:320 |
3600 | 146 | ======= | ||
3601 | 147 | #: ../data/apt_check.py:309 | ||
3602 | 148 | msgid "Show the packages that are going to be installed/upgraded" | ||
3603 | 149 | msgstr "ইনস্টল/ আপগ্রেড করা হবে এমন প্যাকেজগুলি দেখানো হবে" | ||
3604 | 150 | |||
3605 | 151 | #: ../data/apt_check.py:315 | ||
3606 | 152 | msgid "Show human readable output on stdout" | ||
3607 | 153 | msgstr "stdout এর উপর" | ||
3608 | 154 | |||
3609 | 155 | #: ../data/apt_check.py:319 | ||
3610 | 156 | >>>>>>> po/bn.po | ||
3611 | 99 | msgid "" | 157 | msgid "" |
3612 | 100 | "Return the time in days when security updates are installed unattended (0 " | 158 | "Return the time in days when security updates are installed unattended (0 " |
3613 | 101 | "means disabled)" | 159 | "means disabled)" |
3614 | @@ -127,6 +185,23 @@ msgstr "" | |||
3615 | 127 | "আপনার সিস্টেমে (এখন বা অতীতে) একটি অ্যাপলিকেশন ক্র্যাশ করেছে। বিস্তারিত দেখতে " | 185 | "আপনার সিস্টেমে (এখন বা অতীতে) একটি অ্যাপলিকেশন ক্র্যাশ করেছে। বিস্তারিত দেখতে " |
3616 | 128 | "নোটিফিকেশন আইকনে ক্লিক করুন। " | 186 | "নোটিফিকেশন আইকনে ক্লিক করুন। " |
3617 | 129 | 187 | ||
3618 | 188 | <<<<<<< po/bn.po | ||
3619 | 189 | ======= | ||
3620 | 190 | #. Create and show the notification | ||
3621 | 191 | #: ../src/avahi.c:16 | ||
3622 | 192 | msgid "Network service discovery disabled" | ||
3623 | 193 | msgstr "নেটওয়ার্ক সেবা খোঁজা বন্ধ" | ||
3624 | 194 | |||
3625 | 195 | #: ../src/avahi.c:17 | ||
3626 | 196 | msgid "" | ||
3627 | 197 | "Your current network has a .local domain, which is not recommended and " | ||
3628 | 198 | "incompatible with the Avahi network service discovery. The service has been " | ||
3629 | 199 | "disabled." | ||
3630 | 200 | msgstr "" | ||
3631 | 201 | "আপনার বর্তমান নেটওয়ার্কে .local ডোমেইন রয়েছে, যা সুপারিশ করা হয় না এবং আভাহি " | ||
3632 | 202 | "নেটওয়ার্ক সেবা খোঁজার সাথে অসঙ্গতিপূর্ণ। সেবাটি বন্ধ করা হয়েছে।" | ||
3633 | 203 | |||
3634 | 204 | >>>>>>> po/bn.po | ||
3635 | 130 | #: ../src/cdroms.c:48 | 205 | #: ../src/cdroms.c:48 |
3636 | 131 | msgid "Software Packages Volume Detected" | 206 | msgid "Software Packages Volume Detected" |
3637 | 132 | msgstr "সফটওয়্যার প্যাকেজের ভলিউম পাওয়া গিয়েছে" | 207 | msgstr "সফটওয়্যার প্যাকেজের ভলিউম পাওয়া গিয়েছে" |
3638 | @@ -221,9 +296,14 @@ msgid "No current updates" | |||
3639 | 221 | msgstr "- হালনাগাদ সম্বন্ধে জানানো হবে" | 296 | msgstr "- হালনাগাদ সম্বন্ধে জানানো হবে" |
3640 | 222 | 297 | ||
3641 | 223 | #: ../src/livepatch-tray.c:148 | 298 | #: ../src/livepatch-tray.c:148 |
3642 | 299 | <<<<<<< po/bn.po | ||
3643 | 224 | #, c-format | 300 | #, c-format |
3644 | 225 | msgid "%zd current update" | 301 | msgid "%zd current update" |
3645 | 226 | msgid_plural "%zd current updates" | 302 | msgid_plural "%zd current updates" |
3646 | 303 | ======= | ||
3647 | 304 | msgid "%" | ||
3648 | 305 | msgid_plural "%" | ||
3649 | 306 | >>>>>>> po/bn.po | ||
3650 | 227 | msgstr[0] "" | 307 | msgstr[0] "" |
3651 | 228 | msgstr[1] "" | 308 | msgstr[1] "" |
3652 | 229 | 309 | ||
3653 | @@ -324,20 +404,36 @@ msgstr "এটা দেখে মনে হচ্ছে আপনার ইন | |||
3654 | 324 | msgid "A problem occurred when checking for the updates." | 404 | msgid "A problem occurred when checking for the updates." |
3655 | 325 | msgstr "হালনাগাদের জন্য পরীক্ষা করার সময় একটি সমস্যা দেখা দিয়েছে।" | 405 | msgstr "হালনাগাদের জন্য পরীক্ষা করার সময় একটি সমস্যা দেখা দিয়েছে।" |
3656 | 326 | 406 | ||
3657 | 407 | <<<<<<< po/bn.po | ||
3658 | 327 | #: ../src/update-notifier.c:560 | 408 | #: ../src/update-notifier.c:560 |
3659 | 328 | msgid "- inform about updates" | 409 | msgid "- inform about updates" |
3660 | 329 | msgstr "- হালনাগাদ সম্বন্ধে জানানো হবে" | 410 | msgstr "- হালনাগাদ সম্বন্ধে জানানো হবে" |
3661 | 330 | 411 | ||
3662 | 331 | #: ../src/update-notifier.c:562 | 412 | #: ../src/update-notifier.c:562 |
3663 | 413 | ======= | ||
3664 | 414 | #: ../src/update-notifier.c:585 | ||
3665 | 415 | msgid "- inform about updates" | ||
3666 | 416 | msgstr "- হালনাগাদ সম্বন্ধে জানানো হবে" | ||
3667 | 417 | |||
3668 | 418 | #: ../src/update-notifier.c:587 | ||
3669 | 419 | >>>>>>> po/bn.po | ||
3670 | 332 | #, c-format | 420 | #, c-format |
3671 | 333 | msgid "Failed to init the UI: %s\n" | 421 | msgid "Failed to init the UI: %s\n" |
3672 | 334 | msgstr "UI আরম্ভ করতে ব্যর্থ: %s\n" | 422 | msgstr "UI আরম্ভ করতে ব্যর্থ: %s\n" |
3673 | 335 | 423 | ||
3674 | 424 | <<<<<<< po/bn.po | ||
3675 | 336 | #: ../src/update-notifier.c:563 | 425 | #: ../src/update-notifier.c:563 |
3676 | 337 | msgid "unknown error" | 426 | msgid "unknown error" |
3677 | 338 | msgstr "অজানা ত্রুটি" | 427 | msgstr "অজানা ত্রুটি" |
3678 | 339 | 428 | ||
3679 | 340 | #: ../src/update-notifier.c:590 | 429 | #: ../src/update-notifier.c:590 |
3680 | 430 | ======= | ||
3681 | 431 | #: ../src/update-notifier.c:588 | ||
3682 | 432 | msgid "unknown error" | ||
3683 | 433 | msgstr "অজানা ত্রুটি" | ||
3684 | 434 | |||
3685 | 435 | #: ../src/update-notifier.c:615 | ||
3686 | 436 | >>>>>>> po/bn.po | ||
3687 | 341 | msgid "update-notifier" | 437 | msgid "update-notifier" |
3688 | 342 | msgstr "হালনাগাদ-পর্যবেক্ষক" | 438 | msgstr "হালনাগাদ-পর্যবেক্ষক" |
3689 | 343 | 439 | ||
3690 | @@ -407,11 +503,14 @@ msgstr "" | |||
3691 | 407 | "আপনার হয়ত ইন্টারনেট সংযোগ ঠিক করা উচিত, তারপর এই সমস্যা সমাধানের জন্য প্যাকেজ " | 503 | "আপনার হয়ত ইন্টারনেট সংযোগ ঠিক করা উচিত, তারপর এই সমস্যা সমাধানের জন্য প্যাকেজ " |
3692 | 408 | "অপসারণ করে পুনরায় ইনস্টল করা উচিত।" | 504 | "অপসারণ করে পুনরায় ইনস্টল করা উচিত।" |
3693 | 409 | 505 | ||
3694 | 506 | <<<<<<< po/bn.po | ||
3695 | 410 | #~ msgid "%i package can be updated." | 507 | #~ msgid "%i package can be updated." |
3696 | 411 | #~ msgid_plural "%i packages can be updated." | 508 | #~ msgid_plural "%i packages can be updated." |
3697 | 412 | #~ msgstr[0] "%i প্যাকেজ হালনাগাদ করা সম্ভব" | 509 | #~ msgstr[0] "%i প্যাকেজ হালনাগাদ করা সম্ভব" |
3698 | 413 | #~ msgstr[1] "%i প্যাকেজ হালনাগাদ করা সম্ভব" | 510 | #~ msgstr[1] "%i প্যাকেজ হালনাগাদ করা সম্ভব" |
3699 | 414 | 511 | ||
3700 | 512 | ======= | ||
3701 | 513 | >>>>>>> po/bn.po | ||
3702 | 415 | #~ msgid "" | 514 | #~ msgid "" |
3703 | 416 | #~ "<span weight=\"bold\" size=\"larger\">Please enter your password to " | 515 | #~ "<span weight=\"bold\" size=\"larger\">Please enter your password to " |
3704 | 417 | #~ "access problem reports of system programs</span>" | 516 | #~ "access problem reports of system programs</span>" |
3705 | @@ -419,6 +518,7 @@ msgstr "" | |||
3706 | 419 | #~ "<span weight=\"bold\" size=\"larger\">আপনার সিস্টেমের সমস্যার বিবরনী পাওয়ার " | 518 | #~ "<span weight=\"bold\" size=\"larger\">আপনার সিস্টেমের সমস্যার বিবরনী পাওয়ার " |
3707 | 420 | #~ "জন্য অনুগ্রহ করে পাসওয়ার্ড দিন</span>" | 519 | #~ "জন্য অনুগ্রহ করে পাসওয়ার্ড দিন</span>" |
3708 | 421 | 520 | ||
3709 | 521 | <<<<<<< po/bn.po | ||
3710 | 422 | #~ msgid "Network service discovery disabled" | 522 | #~ msgid "Network service discovery disabled" |
3711 | 423 | #~ msgstr "নেটওয়ার্ক সেবা খোঁজা বন্ধ" | 523 | #~ msgstr "নেটওয়ার্ক সেবা খোঁজা বন্ধ" |
3712 | 424 | 524 | ||
3713 | @@ -430,6 +530,8 @@ msgstr "" | |||
3714 | 430 | #~ "আপনার বর্তমান নেটওয়ার্কে .local ডোমেইন রয়েছে, যা সুপারিশ করা হয় না এবং আভাহি " | 530 | #~ "আপনার বর্তমান নেটওয়ার্কে .local ডোমেইন রয়েছে, যা সুপারিশ করা হয় না এবং আভাহি " |
3715 | 431 | #~ "নেটওয়ার্ক সেবা খোঁজার সাথে অসঙ্গতিপূর্ণ। সেবাটি বন্ধ করা হয়েছে।" | 531 | #~ "নেটওয়ার্ক সেবা খোঁজার সাথে অসঙ্গতিপূর্ণ। সেবাটি বন্ধ করা হয়েছে।" |
3716 | 432 | 532 | ||
3717 | 533 | ======= | ||
3718 | 534 | >>>>>>> po/bn.po | ||
3719 | 433 | #~ msgid "Addon volume detected" | 535 | #~ msgid "Addon volume detected" |
3720 | 434 | #~ msgstr "অ্যাডঅন ভলিউম পাওয়া গিয়েছে" | 536 | #~ msgstr "অ্যাডঅন ভলিউম পাওয়া গিয়েছে" |
3721 | 435 | 537 | ||
3722 | diff --git a/po/bo.po b/po/bo.po | |||
3723 | index 1d17f23..b74899a 100644 | |||
3724 | --- a/po/bo.po | |||
3725 | +++ b/po/bo.po | |||
3726 | @@ -7,7 +7,11 @@ msgid "" | |||
3727 | 7 | msgstr "" | 7 | msgstr "" |
3728 | 8 | "Project-Id-Version: update-notifier\n" | 8 | "Project-Id-Version: update-notifier\n" |
3729 | 9 | "Report-Msgid-Bugs-To: \n" | 9 | "Report-Msgid-Bugs-To: \n" |
3730 | 10 | <<<<<<< po/bo.po | ||
3731 | 10 | "POT-Creation-Date: 2020-11-12 23:53+0000\n" | 11 | "POT-Creation-Date: 2020-11-12 23:53+0000\n" |
3732 | 12 | ======= | ||
3733 | 13 | "POT-Creation-Date: 2020-11-19 05:20+0000\n" | ||
3734 | 14 | >>>>>>> po/bo.po | ||
3735 | 11 | "PO-Revision-Date: 2011-06-19 07:49+0000\n" | 15 | "PO-Revision-Date: 2011-06-19 07:49+0000\n" |
3736 | 12 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 16 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
3737 | 13 | "Language-Team: Tibetan <bo@li.org>\n" | 17 | "Language-Team: Tibetan <bo@li.org>\n" |
3738 | @@ -34,32 +38,54 @@ msgstr "" | |||
3739 | 34 | 38 | ||
3740 | 35 | #: ../data/apt_check.py:93 | 39 | #: ../data/apt_check.py:93 |
3741 | 36 | #, python-format | 40 | #, python-format |
3742 | 41 | <<<<<<< po/bo.po | ||
3743 | 37 | msgid "%i update can be installed immediately." | 42 | msgid "%i update can be installed immediately." |
3744 | 38 | msgid_plural "%i updates can be installed immediately." | 43 | msgid_plural "%i updates can be installed immediately." |
3745 | 39 | msgstr[0] "" | 44 | msgstr[0] "" |
3746 | 40 | 45 | ||
3747 | 41 | #: ../data/apt_check.py:101 | 46 | #: ../data/apt_check.py:101 |
3748 | 47 | ======= | ||
3749 | 48 | msgid "%i package can be updated." | ||
3750 | 49 | msgid_plural "%i packages can be updated." | ||
3751 | 50 | msgstr[0] "" | ||
3752 | 51 | msgstr[1] "" | ||
3753 | 52 | |||
3754 | 53 | #: ../data/apt_check.py:99 | ||
3755 | 54 | >>>>>>> po/bo.po | ||
3756 | 42 | #, python-format | 55 | #, python-format |
3757 | 43 | msgid "%i of these updates is fixed through UA Infra: ESM." | 56 | msgid "%i of these updates is fixed through UA Infra: ESM." |
3758 | 44 | msgid_plural "%i of these updates are fixed through UA Infra: ESM." | 57 | msgid_plural "%i of these updates are fixed through UA Infra: ESM." |
3759 | 45 | msgstr[0] "" | 58 | msgstr[0] "" |
3760 | 46 | 59 | ||
3761 | 60 | <<<<<<< po/bo.po | ||
3762 | 47 | #: ../data/apt_check.py:110 | 61 | #: ../data/apt_check.py:110 |
3763 | 62 | ======= | ||
3764 | 63 | #: ../data/apt_check.py:108 | ||
3765 | 64 | >>>>>>> po/bo.po | ||
3766 | 48 | #, python-format | 65 | #, python-format |
3767 | 49 | msgid "%i of these updates is a security update." | 66 | msgid "%i of these updates is a security update." |
3768 | 50 | msgid_plural "%i of these updates are security updates." | 67 | msgid_plural "%i of these updates are security updates." |
3769 | 51 | msgstr[0] "" | 68 | msgstr[0] "" |
3770 | 52 | 69 | ||
3771 | 70 | <<<<<<< po/bo.po | ||
3772 | 53 | #: ../data/apt_check.py:119 | 71 | #: ../data/apt_check.py:119 |
3773 | 54 | msgid "To see these additional updates run: apt list --upgradable" | 72 | msgid "To see these additional updates run: apt list --upgradable" |
3774 | 55 | msgstr "" | 73 | msgstr "" |
3775 | 56 | 74 | ||
3776 | 57 | #: ../data/apt_check.py:126 | 75 | #: ../data/apt_check.py:126 |
3777 | 76 | ======= | ||
3778 | 77 | #: ../data/apt_check.py:117 | ||
3779 | 78 | msgid "To see these additional updates run: apt list --upgradable" | ||
3780 | 79 | msgstr "" | ||
3781 | 80 | |||
3782 | 81 | #: ../data/apt_check.py:124 | ||
3783 | 82 | >>>>>>> po/bo.po | ||
3784 | 58 | #, python-format | 83 | #, python-format |
3785 | 59 | msgid "Enable UA Infra: ESM to receive %i additional security update." | 84 | msgid "Enable UA Infra: ESM to receive %i additional security update." |
3786 | 60 | msgid_plural "Enable UA Infra: ESM to receive %i additional security updates." | 85 | msgid_plural "Enable UA Infra: ESM to receive %i additional security updates." |
3787 | 61 | msgstr[0] "" | 86 | msgstr[0] "" |
3788 | 62 | 87 | ||
3789 | 88 | <<<<<<< po/bo.po | ||
3790 | 63 | #: ../data/apt_check.py:137 | 89 | #: ../data/apt_check.py:137 |
3791 | 64 | msgid "Enable UA Infra: ESM to receive additional future security updates." | 90 | msgid "Enable UA Infra: ESM to receive additional future security updates." |
3792 | 65 | msgstr "" | 91 | msgstr "" |
3793 | @@ -69,19 +95,39 @@ msgid "See https://ubuntu.com/security/esm or run: sudo ua status" | |||
3794 | 69 | msgstr "" | 95 | msgstr "" |
3795 | 70 | 96 | ||
3796 | 71 | #: ../data/apt_check.py:184 | 97 | #: ../data/apt_check.py:184 |
3797 | 98 | ======= | ||
3798 | 99 | #: ../data/apt_check.py:135 | ||
3799 | 100 | msgid "Enable UA Infra: ESM to receive additional future security updates." | ||
3800 | 101 | msgstr "" | ||
3801 | 102 | |||
3802 | 103 | #: ../data/apt_check.py:140 | ||
3803 | 104 | msgid "See https://ubuntu.com/security/esm or run: sudo ua status" | ||
3804 | 105 | msgstr "" | ||
3805 | 106 | |||
3806 | 107 | #: ../data/apt_check.py:182 | ||
3807 | 108 | >>>>>>> po/bo.po | ||
3808 | 72 | #, python-format | 109 | #, python-format |
3809 | 73 | msgid "Error: Opening the cache (%s)" | 110 | msgid "Error: Opening the cache (%s)" |
3810 | 74 | msgstr "" | 111 | msgstr "" |
3811 | 75 | 112 | ||
3812 | 113 | <<<<<<< po/bo.po | ||
3813 | 76 | #: ../data/apt_check.py:194 | 114 | #: ../data/apt_check.py:194 |
3814 | 77 | msgid "Error: BrokenCount > 0" | 115 | msgid "Error: BrokenCount > 0" |
3815 | 78 | msgstr "" | 116 | msgstr "" |
3816 | 79 | 117 | ||
3817 | 80 | #: ../data/apt_check.py:201 | 118 | #: ../data/apt_check.py:201 |
3818 | 119 | ======= | ||
3819 | 120 | #: ../data/apt_check.py:192 | ||
3820 | 121 | msgid "Error: BrokenCount > 0" | ||
3821 | 122 | msgstr "" | ||
3822 | 123 | |||
3823 | 124 | #: ../data/apt_check.py:199 | ||
3824 | 125 | >>>>>>> po/bo.po | ||
3825 | 81 | #, python-format | 126 | #, python-format |
3826 | 82 | msgid "Error: Marking the upgrade (%s)" | 127 | msgid "Error: Marking the upgrade (%s)" |
3827 | 83 | msgstr "" | 128 | msgstr "" |
3828 | 84 | 129 | ||
3829 | 130 | <<<<<<< po/bo.po | ||
3830 | 85 | #: ../data/apt_check.py:310 | 131 | #: ../data/apt_check.py:310 |
3831 | 86 | msgid "Show the packages that are going to be installed/upgraded" | 132 | msgid "Show the packages that are going to be installed/upgraded" |
3832 | 87 | msgstr "" | 133 | msgstr "" |
3833 | @@ -91,6 +137,17 @@ msgid "Show human readable output on stdout" | |||
3834 | 91 | msgstr "" | 137 | msgstr "" |
3835 | 92 | 138 | ||
3836 | 93 | #: ../data/apt_check.py:320 | 139 | #: ../data/apt_check.py:320 |
3837 | 140 | ======= | ||
3838 | 141 | #: ../data/apt_check.py:309 | ||
3839 | 142 | msgid "Show the packages that are going to be installed/upgraded" | ||
3840 | 143 | msgstr "" | ||
3841 | 144 | |||
3842 | 145 | #: ../data/apt_check.py:315 | ||
3843 | 146 | msgid "Show human readable output on stdout" | ||
3844 | 147 | msgstr "" | ||
3845 | 148 | |||
3846 | 149 | #: ../data/apt_check.py:319 | ||
3847 | 150 | >>>>>>> po/bo.po | ||
3848 | 94 | msgid "" | 151 | msgid "" |
3849 | 95 | "Return the time in days when security updates are installed unattended (0 " | 152 | "Return the time in days when security updates are installed unattended (0 " |
3850 | 96 | "means disabled)" | 153 | "means disabled)" |
3851 | @@ -118,6 +175,21 @@ msgid "" | |||
3852 | 118 | "notification icon to display details. " | 175 | "notification icon to display details. " |
3853 | 119 | msgstr "" | 176 | msgstr "" |
3854 | 120 | 177 | ||
3855 | 178 | <<<<<<< po/bo.po | ||
3856 | 179 | ======= | ||
3857 | 180 | #. Create and show the notification | ||
3858 | 181 | #: ../src/avahi.c:16 | ||
3859 | 182 | msgid "Network service discovery disabled" | ||
3860 | 183 | msgstr "" | ||
3861 | 184 | |||
3862 | 185 | #: ../src/avahi.c:17 | ||
3863 | 186 | msgid "" | ||
3864 | 187 | "Your current network has a .local domain, which is not recommended and " | ||
3865 | 188 | "incompatible with the Avahi network service discovery. The service has been " | ||
3866 | 189 | "disabled." | ||
3867 | 190 | msgstr "" | ||
3868 | 191 | |||
3869 | 192 | >>>>>>> po/bo.po | ||
3870 | 121 | #: ../src/cdroms.c:48 | 193 | #: ../src/cdroms.c:48 |
3871 | 122 | msgid "Software Packages Volume Detected" | 194 | msgid "Software Packages Volume Detected" |
3872 | 123 | msgstr "" | 195 | msgstr "" |
3873 | @@ -199,9 +271,14 @@ msgid "No current updates" | |||
3874 | 199 | msgstr "" | 271 | msgstr "" |
3875 | 200 | 272 | ||
3876 | 201 | #: ../src/livepatch-tray.c:148 | 273 | #: ../src/livepatch-tray.c:148 |
3877 | 274 | <<<<<<< po/bo.po | ||
3878 | 202 | #, c-format | 275 | #, c-format |
3879 | 203 | msgid "%zd current update" | 276 | msgid "%zd current update" |
3880 | 204 | msgid_plural "%zd current updates" | 277 | msgid_plural "%zd current updates" |
3881 | 278 | ======= | ||
3882 | 279 | msgid "%" | ||
3883 | 280 | msgid_plural "%" | ||
3884 | 281 | >>>>>>> po/bo.po | ||
3885 | 205 | msgstr[0] "" | 282 | msgstr[0] "" |
3886 | 206 | 283 | ||
3887 | 207 | #: ../src/livepatch-tray.c:168 | 284 | #: ../src/livepatch-tray.c:168 |
3888 | @@ -285,20 +362,36 @@ msgstr "" | |||
3889 | 285 | msgid "A problem occurred when checking for the updates." | 362 | msgid "A problem occurred when checking for the updates." |
3890 | 286 | msgstr "" | 363 | msgstr "" |
3891 | 287 | 364 | ||
3892 | 365 | <<<<<<< po/bo.po | ||
3893 | 288 | #: ../src/update-notifier.c:560 | 366 | #: ../src/update-notifier.c:560 |
3894 | 289 | msgid "- inform about updates" | 367 | msgid "- inform about updates" |
3895 | 290 | msgstr "" | 368 | msgstr "" |
3896 | 291 | 369 | ||
3897 | 292 | #: ../src/update-notifier.c:562 | 370 | #: ../src/update-notifier.c:562 |
3898 | 371 | ======= | ||
3899 | 372 | #: ../src/update-notifier.c:585 | ||
3900 | 373 | msgid "- inform about updates" | ||
3901 | 374 | msgstr "" | ||
3902 | 375 | |||
3903 | 376 | #: ../src/update-notifier.c:587 | ||
3904 | 377 | >>>>>>> po/bo.po | ||
3905 | 293 | #, c-format | 378 | #, c-format |
3906 | 294 | msgid "Failed to init the UI: %s\n" | 379 | msgid "Failed to init the UI: %s\n" |
3907 | 295 | msgstr "" | 380 | msgstr "" |
3908 | 296 | 381 | ||
3909 | 382 | <<<<<<< po/bo.po | ||
3910 | 297 | #: ../src/update-notifier.c:563 | 383 | #: ../src/update-notifier.c:563 |
3911 | 298 | msgid "unknown error" | 384 | msgid "unknown error" |
3912 | 299 | msgstr "" | 385 | msgstr "" |
3913 | 300 | 386 | ||
3914 | 301 | #: ../src/update-notifier.c:590 | 387 | #: ../src/update-notifier.c:590 |
3915 | 388 | ======= | ||
3916 | 389 | #: ../src/update-notifier.c:588 | ||
3917 | 390 | msgid "unknown error" | ||
3918 | 391 | msgstr "" | ||
3919 | 392 | |||
3920 | 393 | #: ../src/update-notifier.c:615 | ||
3921 | 394 | >>>>>>> po/bo.po | ||
3922 | 302 | msgid "update-notifier" | 395 | msgid "update-notifier" |
3923 | 303 | msgstr "" | 396 | msgstr "" |
3924 | 304 | 397 | ||
3925 | diff --git a/po/br.po b/po/br.po | |||
3926 | index 5a1ce5c..5b1cc71 100644 | |||
3927 | --- a/po/br.po | |||
3928 | +++ b/po/br.po | |||
3929 | @@ -7,7 +7,11 @@ msgid "" | |||
3930 | 7 | msgstr "" | 7 | msgstr "" |
3931 | 8 | "Project-Id-Version: update-notifier\n" | 8 | "Project-Id-Version: update-notifier\n" |
3932 | 9 | "Report-Msgid-Bugs-To: \n" | 9 | "Report-Msgid-Bugs-To: \n" |
3933 | 10 | <<<<<<< po/br.po | ||
3934 | 10 | "POT-Creation-Date: 2020-11-12 23:53+0000\n" | 11 | "POT-Creation-Date: 2020-11-12 23:53+0000\n" |
3935 | 12 | ======= | ||
3936 | 13 | "POT-Creation-Date: 2020-11-19 05:20+0000\n" | ||
3937 | 14 | >>>>>>> po/br.po | ||
3938 | 11 | "PO-Revision-Date: 2013-04-01 16:49+0000\n" | 15 | "PO-Revision-Date: 2013-04-01 16:49+0000\n" |
3939 | 12 | "Last-Translator: Denis <Unknown>\n" | 16 | "Last-Translator: Denis <Unknown>\n" |
3940 | 13 | "Language-Team: Breton <br@li.org>\n" | 17 | "Language-Team: Breton <br@li.org>\n" |
3941 | @@ -33,6 +37,7 @@ msgid "UA Infra: Extended Security Maintenance (ESM) is not enabled." | |||
3942 | 33 | msgstr "" | 37 | msgstr "" |
3943 | 34 | 38 | ||
3944 | 35 | #: ../data/apt_check.py:93 | 39 | #: ../data/apt_check.py:93 |
3945 | 40 | <<<<<<< po/br.po | ||
3946 | 36 | #, fuzzy, python-format | 41 | #, fuzzy, python-format |
3947 | 37 | msgid "%i update can be installed immediately." | 42 | msgid "%i update can be installed immediately." |
3948 | 38 | msgid_plural "%i updates can be installed immediately." | 43 | msgid_plural "%i updates can be installed immediately." |
3949 | @@ -40,30 +45,52 @@ msgstr[0] "%i hivizadenn a-fet diogelroez." | |||
3950 | 40 | msgstr[1] "%i hivizadenn a-fet diogelroez." | 45 | msgstr[1] "%i hivizadenn a-fet diogelroez." |
3951 | 41 | 46 | ||
3952 | 42 | #: ../data/apt_check.py:101 | 47 | #: ../data/apt_check.py:101 |
3953 | 48 | ======= | ||
3954 | 49 | #, python-format | ||
3955 | 50 | msgid "%i package can be updated." | ||
3956 | 51 | msgid_plural "%i packages can be updated." | ||
3957 | 52 | msgstr[0] "%i pakad a c'hall bezañ hivizaet." | ||
3958 | 53 | msgstr[1] "%i a bakadoù a c'hall bezañ hivizaet." | ||
3959 | 54 | |||
3960 | 55 | #: ../data/apt_check.py:99 | ||
3961 | 56 | >>>>>>> po/br.po | ||
3962 | 43 | #, python-format | 57 | #, python-format |
3963 | 44 | msgid "%i of these updates is fixed through UA Infra: ESM." | 58 | msgid "%i of these updates is fixed through UA Infra: ESM." |
3964 | 45 | msgid_plural "%i of these updates are fixed through UA Infra: ESM." | 59 | msgid_plural "%i of these updates are fixed through UA Infra: ESM." |
3965 | 46 | msgstr[0] "" | 60 | msgstr[0] "" |
3966 | 47 | msgstr[1] "" | 61 | msgstr[1] "" |
3967 | 48 | 62 | ||
3968 | 63 | <<<<<<< po/br.po | ||
3969 | 49 | #: ../data/apt_check.py:110 | 64 | #: ../data/apt_check.py:110 |
3970 | 65 | ======= | ||
3971 | 66 | #: ../data/apt_check.py:108 | ||
3972 | 67 | >>>>>>> po/br.po | ||
3973 | 50 | #, fuzzy, python-format | 68 | #, fuzzy, python-format |
3974 | 51 | msgid "%i of these updates is a security update." | 69 | msgid "%i of these updates is a security update." |
3975 | 52 | msgid_plural "%i of these updates are security updates." | 70 | msgid_plural "%i of these updates are security updates." |
3976 | 53 | msgstr[0] "%i hivizadenn a-fet diogelroez." | 71 | msgstr[0] "%i hivizadenn a-fet diogelroez." |
3977 | 54 | msgstr[1] "%i hivizadenn a-fet diogelroez." | 72 | msgstr[1] "%i hivizadenn a-fet diogelroez." |
3978 | 55 | 73 | ||
3979 | 74 | <<<<<<< po/br.po | ||
3980 | 56 | #: ../data/apt_check.py:119 | 75 | #: ../data/apt_check.py:119 |
3981 | 57 | msgid "To see these additional updates run: apt list --upgradable" | 76 | msgid "To see these additional updates run: apt list --upgradable" |
3982 | 58 | msgstr "" | 77 | msgstr "" |
3983 | 59 | 78 | ||
3984 | 60 | #: ../data/apt_check.py:126 | 79 | #: ../data/apt_check.py:126 |
3985 | 80 | ======= | ||
3986 | 81 | #: ../data/apt_check.py:117 | ||
3987 | 82 | msgid "To see these additional updates run: apt list --upgradable" | ||
3988 | 83 | msgstr "" | ||
3989 | 84 | |||
3990 | 85 | #: ../data/apt_check.py:124 | ||
3991 | 86 | >>>>>>> po/br.po | ||
3992 | 61 | #, python-format | 87 | #, python-format |
3993 | 62 | msgid "Enable UA Infra: ESM to receive %i additional security update." | 88 | msgid "Enable UA Infra: ESM to receive %i additional security update." |
3994 | 63 | msgid_plural "Enable UA Infra: ESM to receive %i additional security updates." | 89 | msgid_plural "Enable UA Infra: ESM to receive %i additional security updates." |
3995 | 64 | msgstr[0] "" | 90 | msgstr[0] "" |
3996 | 65 | msgstr[1] "" | 91 | msgstr[1] "" |
3997 | 66 | 92 | ||
3998 | 93 | <<<<<<< po/br.po | ||
3999 | 67 | #: ../data/apt_check.py:137 | 94 | #: ../data/apt_check.py:137 |
4000 | 68 | msgid "Enable UA Infra: ESM to receive additional future security updates." | 95 | msgid "Enable UA Infra: ESM to receive additional future security updates." |
4001 | 69 | msgstr "" | 96 | msgstr "" |
4002 | @@ -73,19 +100,39 @@ msgid "See https://ubuntu.com/security/esm or run: sudo ua status" | |||
4003 | 73 | msgstr "" | 100 | msgstr "" |
4004 | 74 | 101 | ||
4005 | 75 | #: ../data/apt_check.py:184 | 102 | #: ../data/apt_check.py:184 |
4006 | 103 | ======= | ||
4007 | 104 | #: ../data/apt_check.py:135 | ||
4008 | 105 | msgid "Enable UA Infra: ESM to receive additional future security updates." | ||
4009 | 106 | msgstr "" | ||
4010 | 107 | |||
4011 | 108 | #: ../data/apt_check.py:140 | ||
4012 | 109 | msgid "See https://ubuntu.com/security/esm or run: sudo ua status" | ||
4013 | 110 | msgstr "" | ||
4014 | 111 | |||
4015 | 112 | #: ../data/apt_check.py:182 | ||
4016 | 113 | >>>>>>> po/br.po | ||
4017 | 76 | #, python-format | 114 | #, python-format |
4018 | 77 | msgid "Error: Opening the cache (%s)" | 115 | msgid "Error: Opening the cache (%s)" |
4019 | 78 | msgstr "Fazi : O tigeriñ ar grubuilh (%s)" | 116 | msgstr "Fazi : O tigeriñ ar grubuilh (%s)" |
4020 | 79 | 117 | ||
4021 | 118 | <<<<<<< po/br.po | ||
4022 | 80 | #: ../data/apt_check.py:194 | 119 | #: ../data/apt_check.py:194 |
4023 | 81 | msgid "Error: BrokenCount > 0" | 120 | msgid "Error: BrokenCount > 0" |
4024 | 82 | msgstr "Fazi : Pakadoù torret > 0" | 121 | msgstr "Fazi : Pakadoù torret > 0" |
4025 | 83 | 122 | ||
4026 | 84 | #: ../data/apt_check.py:201 | 123 | #: ../data/apt_check.py:201 |
4027 | 124 | ======= | ||
4028 | 125 | #: ../data/apt_check.py:192 | ||
4029 | 126 | msgid "Error: BrokenCount > 0" | ||
4030 | 127 | msgstr "Fazi : Pakadoù torret > 0" | ||
4031 | 128 | |||
4032 | 129 | #: ../data/apt_check.py:199 | ||
4033 | 130 | >>>>>>> po/br.po | ||
4034 | 85 | #, python-format | 131 | #, python-format |
4035 | 86 | msgid "Error: Marking the upgrade (%s)" | 132 | msgid "Error: Marking the upgrade (%s)" |
4036 | 87 | msgstr "Fazi : Merk an hivizadenn (%s)" | 133 | msgstr "Fazi : Merk an hivizadenn (%s)" |
4037 | 88 | 134 | ||
4038 | 135 | <<<<<<< po/br.po | ||
4039 | 89 | #: ../data/apt_check.py:310 | 136 | #: ../data/apt_check.py:310 |
4040 | 90 | msgid "Show the packages that are going to be installed/upgraded" | 137 | msgid "Show the packages that are going to be installed/upgraded" |
4041 | 91 | msgstr "Diskouez ar pakadoù a vo staliet/hivizaet" | 138 | msgstr "Diskouez ar pakadoù a vo staliet/hivizaet" |
4042 | @@ -95,6 +142,17 @@ msgid "Show human readable output on stdout" | |||
4043 | 95 | msgstr "Diskouez un un ec'hankad a c'hell bezañ lennet gant un den war stdout" | 142 | msgstr "Diskouez un un ec'hankad a c'hell bezañ lennet gant un den war stdout" |
4044 | 96 | 143 | ||
4045 | 97 | #: ../data/apt_check.py:320 | 144 | #: ../data/apt_check.py:320 |
4046 | 145 | ======= | ||
4047 | 146 | #: ../data/apt_check.py:309 | ||
4048 | 147 | msgid "Show the packages that are going to be installed/upgraded" | ||
4049 | 148 | msgstr "Diskouez ar pakadoù a vo staliet/hivizaet" | ||
4050 | 149 | |||
4051 | 150 | #: ../data/apt_check.py:315 | ||
4052 | 151 | msgid "Show human readable output on stdout" | ||
4053 | 152 | msgstr "Diskouez un un ec'hankad a c'hell bezañ lennet gant un den war stdout" | ||
4054 | 153 | |||
4055 | 154 | #: ../data/apt_check.py:319 | ||
4056 | 155 | >>>>>>> po/br.po | ||
4057 | 98 | msgid "" | 156 | msgid "" |
4058 | 99 | "Return the time in days when security updates are installed unattended (0 " | 157 | "Return the time in days when security updates are installed unattended (0 " |
4059 | 100 | "means disabled)" | 158 | "means disabled)" |
4060 | @@ -126,6 +184,23 @@ msgstr "" | |||
4061 | 126 | "Sac'het eo un arload war ho reizhiad (bremañ pe a-raok). Klikit war an arlun-" | 184 | "Sac'het eo un arload war ho reizhiad (bremañ pe a-raok). Klikit war an arlun-" |
4062 | 127 | "kelaouiñ evit skrammañ ar munudoù. " | 185 | "kelaouiñ evit skrammañ ar munudoù. " |
4063 | 128 | 186 | ||
4064 | 187 | <<<<<<< po/br.po | ||
4065 | 188 | ======= | ||
4066 | 189 | #. Create and show the notification | ||
4067 | 190 | #: ../src/avahi.c:16 | ||
4068 | 191 | msgid "Network service discovery disabled" | ||
4069 | 192 | msgstr "Klask gwazerezhioù ar rouedad diweredekaet" | ||
4070 | 193 | |||
4071 | 194 | #: ../src/avahi.c:17 | ||
4072 | 195 | msgid "" | ||
4073 | 196 | "Your current network has a .local domain, which is not recommended and " | ||
4074 | 197 | "incompatible with the Avahi network service discovery. The service has been " | ||
4075 | 198 | "disabled." | ||
4076 | 199 | msgstr "" | ||
4077 | 200 | "Un domani .local a zo gant ho rouedad, n'eo ket erbedet hag embreget gant ar " | ||
4078 | 201 | "c'hlask gwazerezhioù evit ar rouedad Avahi. Diweredekaet eo bet ar gwazerezh." | ||
4079 | 202 | |||
4080 | 203 | >>>>>>> po/br.po | ||
4081 | 129 | #: ../src/cdroms.c:48 | 204 | #: ../src/cdroms.c:48 |
4082 | 130 | msgid "Software Packages Volume Detected" | 205 | msgid "Software Packages Volume Detected" |
4083 | 131 | msgstr "Pezhienn a ginnig pakadoù meziant dinoet" | 206 | msgstr "Pezhienn a ginnig pakadoù meziant dinoet" |
4084 | @@ -220,9 +295,14 @@ msgid "No current updates" | |||
4085 | 220 | msgstr "- titour diwar benn hizivadennoù" | 295 | msgstr "- titour diwar benn hizivadennoù" |
4086 | 221 | 296 | ||
4087 | 222 | #: ../src/livepatch-tray.c:148 | 297 | #: ../src/livepatch-tray.c:148 |
4088 | 298 | <<<<<<< po/br.po | ||
4089 | 223 | #, c-format | 299 | #, c-format |
4090 | 224 | msgid "%zd current update" | 300 | msgid "%zd current update" |
4091 | 225 | msgid_plural "%zd current updates" | 301 | msgid_plural "%zd current updates" |
4092 | 302 | ======= | ||
4093 | 303 | msgid "%" | ||
4094 | 304 | msgid_plural "%" | ||
4095 | 305 | >>>>>>> po/br.po | ||
4096 | 226 | msgstr[0] "" | 306 | msgstr[0] "" |
4097 | 227 | msgstr[1] "" | 307 | msgstr[1] "" |
4098 | 228 | 308 | ||
4099 | @@ -320,20 +400,36 @@ msgstr "Alies e talvez ez eus amzalc'hioù diziskoulm gant ho pakadoù staliet" | |||
4100 | 320 | msgid "A problem occurred when checking for the updates." | 400 | msgid "A problem occurred when checking for the updates." |
4101 | 321 | msgstr "Ur gudenn a zo bet pa oa o wiriañ an hizivadennoù." | 401 | msgstr "Ur gudenn a zo bet pa oa o wiriañ an hizivadennoù." |
4102 | 322 | 402 | ||
4103 | 403 | <<<<<<< po/br.po | ||
4104 | 323 | #: ../src/update-notifier.c:560 | 404 | #: ../src/update-notifier.c:560 |
4105 | 324 | msgid "- inform about updates" | 405 | msgid "- inform about updates" |
4106 | 325 | msgstr "- titour diwar benn hizivadennoù" | 406 | msgstr "- titour diwar benn hizivadennoù" |
4107 | 326 | 407 | ||
4108 | 327 | #: ../src/update-notifier.c:562 | 408 | #: ../src/update-notifier.c:562 |
4109 | 409 | ======= | ||
4110 | 410 | #: ../src/update-notifier.c:585 | ||
4111 | 411 | msgid "- inform about updates" | ||
4112 | 412 | msgstr "- titour diwar benn hizivadennoù" | ||
4113 | 413 | |||
4114 | 414 | #: ../src/update-notifier.c:587 | ||
4115 | 415 | >>>>>>> po/br.po | ||
4116 | 328 | #, c-format | 416 | #, c-format |
4117 | 329 | msgid "Failed to init the UI: %s\n" | 417 | msgid "Failed to init the UI: %s\n" |
4118 | 330 | msgstr "C'hwitadenn war deraouekaat ketal an arveriad : %s\n" | 418 | msgstr "C'hwitadenn war deraouekaat ketal an arveriad : %s\n" |
4119 | 331 | 419 | ||
4120 | 420 | <<<<<<< po/br.po | ||
4121 | 332 | #: ../src/update-notifier.c:563 | 421 | #: ../src/update-notifier.c:563 |
4122 | 333 | msgid "unknown error" | 422 | msgid "unknown error" |
4123 | 334 | msgstr "fazi dianav" | 423 | msgstr "fazi dianav" |
4124 | 335 | 424 | ||
4125 | 336 | #: ../src/update-notifier.c:590 | 425 | #: ../src/update-notifier.c:590 |
4126 | 426 | ======= | ||
4127 | 427 | #: ../src/update-notifier.c:588 | ||
4128 | 428 | msgid "unknown error" | ||
4129 | 429 | msgstr "fazi dianav" | ||
4130 | 430 | |||
4131 | 431 | #: ../src/update-notifier.c:615 | ||
4132 | 432 | >>>>>>> po/br.po | ||
4133 | 337 | msgid "update-notifier" | 433 | msgid "update-notifier" |
4134 | 338 | msgstr "Meziant kelaouiñ a-fet hizivadennoù" | 434 | msgstr "Meziant kelaouiñ a-fet hizivadennoù" |
4135 | 339 | 435 | ||
4136 | @@ -396,11 +492,14 @@ msgid "" | |||
4137 | 396 | "reinstall the packages to fix this problem." | 492 | "reinstall the packages to fix this problem." |
4138 | 397 | msgstr "" | 493 | msgstr "" |
4139 | 398 | 494 | ||
4140 | 495 | <<<<<<< po/br.po | ||
4141 | 399 | #~ msgid "%i package can be updated." | 496 | #~ msgid "%i package can be updated." |
4142 | 400 | #~ msgid_plural "%i packages can be updated." | 497 | #~ msgid_plural "%i packages can be updated." |
4143 | 401 | #~ msgstr[0] "%i pakad a c'hall bezañ hivizaet." | 498 | #~ msgstr[0] "%i pakad a c'hall bezañ hivizaet." |
4144 | 402 | #~ msgstr[1] "%i a bakadoù a c'hall bezañ hivizaet." | 499 | #~ msgstr[1] "%i a bakadoù a c'hall bezañ hivizaet." |
4145 | 403 | 500 | ||
4146 | 501 | ======= | ||
4147 | 502 | >>>>>>> po/br.po | ||
4148 | 404 | #~ msgid "" | 503 | #~ msgid "" |
4149 | 405 | #~ "<span weight=\"bold\" size=\"larger\">Please enter your password to " | 504 | #~ "<span weight=\"bold\" size=\"larger\">Please enter your password to " |
4150 | 406 | #~ "access problem reports of system programs</span>" | 505 | #~ "access problem reports of system programs</span>" |
4151 | @@ -408,6 +507,7 @@ msgstr "" | |||
4152 | 408 | #~ "<span weight=\"bold\" size=\"larger\">Bizskrivit ho ker-tremen evit " | 507 | #~ "<span weight=\"bold\" size=\"larger\">Bizskrivit ho ker-tremen evit " |
4153 | 409 | #~ "tizhout an danevelloù a-fet fazioù eus meziantoù ar reizhiad</span>" | 508 | #~ "tizhout an danevelloù a-fet fazioù eus meziantoù ar reizhiad</span>" |
4154 | 410 | 509 | ||
4155 | 510 | <<<<<<< po/br.po | ||
4156 | 411 | #~ msgid "Network service discovery disabled" | 511 | #~ msgid "Network service discovery disabled" |
4157 | 412 | #~ msgstr "Klask gwazerezhioù ar rouedad diweredekaet" | 512 | #~ msgstr "Klask gwazerezhioù ar rouedad diweredekaet" |
4158 | 413 | 513 | ||
4159 | @@ -420,6 +520,8 @@ msgstr "" | |||
4160 | 420 | #~ "ar c'hlask gwazerezhioù evit ar rouedad Avahi. Diweredekaet eo bet ar " | 520 | #~ "ar c'hlask gwazerezhioù evit ar rouedad Avahi. Diweredekaet eo bet ar " |
4161 | 421 | #~ "gwazerezh." | 521 | #~ "gwazerezh." |
4162 | 422 | 522 | ||
4163 | 523 | ======= | ||
4164 | 524 | >>>>>>> po/br.po | ||
4165 | 423 | #~ msgid "Addon volume detected" | 525 | #~ msgid "Addon volume detected" |
4166 | 424 | #~ msgstr "Dinoet ez eus bet ur bezhienn ouzhpenn" | 526 | #~ msgstr "Dinoet ez eus bet ur bezhienn ouzhpenn" |
4167 | 425 | 527 | ||
4168 | diff --git a/po/bs.po b/po/bs.po | |||
4169 | index 905c127..b589ba1 100644 | |||
4170 | --- a/po/bs.po | |||
4171 | +++ b/po/bs.po | |||
4172 | @@ -7,7 +7,11 @@ msgid "" | |||
4173 | 7 | msgstr "" | 7 | msgstr "" |
4174 | 8 | "Project-Id-Version: update-notifier\n" | 8 | "Project-Id-Version: update-notifier\n" |
4175 | 9 | "Report-Msgid-Bugs-To: \n" | 9 | "Report-Msgid-Bugs-To: \n" |
4176 | 10 | <<<<<<< po/bs.po | ||
4177 | 10 | "POT-Creation-Date: 2020-11-12 23:53+0000\n" | 11 | "POT-Creation-Date: 2020-11-12 23:53+0000\n" |
4178 | 12 | ======= | ||
4179 | 13 | "POT-Creation-Date: 2020-11-19 05:20+0000\n" | ||
4180 | 14 | >>>>>>> po/bs.po | ||
4181 | 11 | "PO-Revision-Date: 2012-04-13 06:13+0000\n" | 15 | "PO-Revision-Date: 2012-04-13 06:13+0000\n" |
4182 | 12 | "Last-Translator: Samir Ribić <Unknown>\n" | 16 | "Last-Translator: Samir Ribić <Unknown>\n" |
4183 | 13 | "Language-Team: Bosnian <bs@li.org>\n" | 17 | "Language-Team: Bosnian <bs@li.org>\n" |
4184 | @@ -34,6 +38,7 @@ msgid "UA Infra: Extended Security Maintenance (ESM) is not enabled." | |||
4185 | 34 | msgstr "" | 38 | msgstr "" |
4186 | 35 | 39 | ||
4187 | 36 | #: ../data/apt_check.py:93 | 40 | #: ../data/apt_check.py:93 |
4188 | 41 | <<<<<<< po/bs.po | ||
4189 | 37 | #, fuzzy, python-format | 42 | #, fuzzy, python-format |
4190 | 38 | msgid "%i update can be installed immediately." | 43 | msgid "%i update can be installed immediately." |
4191 | 39 | msgid_plural "%i updates can be installed immediately." | 44 | msgid_plural "%i updates can be installed immediately." |
4192 | @@ -42,6 +47,16 @@ msgstr[1] "%i osvježavanja su sigurnosna" | |||
4193 | 42 | msgstr[2] "%i osvježavanja su sigurnosna" | 47 | msgstr[2] "%i osvježavanja su sigurnosna" |
4194 | 43 | 48 | ||
4195 | 44 | #: ../data/apt_check.py:101 | 49 | #: ../data/apt_check.py:101 |
4196 | 50 | ======= | ||
4197 | 51 | #, python-format | ||
4198 | 52 | msgid "%i package can be updated." | ||
4199 | 53 | msgid_plural "%i packages can be updated." | ||
4200 | 54 | msgstr[0] "%i paket može biti osvježen" | ||
4201 | 55 | msgstr[1] "%i paketa mogu biti osvježena" | ||
4202 | 56 | msgstr[2] "%i paketa može biti osvježeno" | ||
4203 | 57 | |||
4204 | 58 | #: ../data/apt_check.py:99 | ||
4205 | 59 | >>>>>>> po/bs.po | ||
4206 | 45 | #, python-format | 60 | #, python-format |
4207 | 46 | msgid "%i of these updates is fixed through UA Infra: ESM." | 61 | msgid "%i of these updates is fixed through UA Infra: ESM." |
4208 | 47 | msgid_plural "%i of these updates are fixed through UA Infra: ESM." | 62 | msgid_plural "%i of these updates are fixed through UA Infra: ESM." |
4209 | @@ -49,7 +64,11 @@ msgstr[0] "" | |||
4210 | 49 | msgstr[1] "" | 64 | msgstr[1] "" |
4211 | 50 | msgstr[2] "" | 65 | msgstr[2] "" |
4212 | 51 | 66 | ||
4213 | 67 | <<<<<<< po/bs.po | ||
4214 | 52 | #: ../data/apt_check.py:110 | 68 | #: ../data/apt_check.py:110 |
4215 | 69 | ======= | ||
4216 | 70 | #: ../data/apt_check.py:108 | ||
4217 | 71 | >>>>>>> po/bs.po | ||
4218 | 53 | #, fuzzy, python-format | 72 | #, fuzzy, python-format |
4219 | 54 | msgid "%i of these updates is a security update." | 73 | msgid "%i of these updates is a security update." |
4220 | 55 | msgid_plural "%i of these updates are security updates." | 74 | msgid_plural "%i of these updates are security updates." |
4221 | @@ -57,11 +76,19 @@ msgstr[0] "%i osvježavanje je sigurnosno" | |||
4222 | 57 | msgstr[1] "%i osvježavanja su sigurnosna" | 76 | msgstr[1] "%i osvježavanja su sigurnosna" |
4223 | 58 | msgstr[2] "%i osvježavanja su sigurnosna" | 77 | msgstr[2] "%i osvježavanja su sigurnosna" |
4224 | 59 | 78 | ||
4225 | 79 | <<<<<<< po/bs.po | ||
4226 | 60 | #: ../data/apt_check.py:119 | 80 | #: ../data/apt_check.py:119 |
4227 | 61 | msgid "To see these additional updates run: apt list --upgradable" | 81 | msgid "To see these additional updates run: apt list --upgradable" |
4228 | 62 | msgstr "" | 82 | msgstr "" |
4229 | 63 | 83 | ||
4230 | 64 | #: ../data/apt_check.py:126 | 84 | #: ../data/apt_check.py:126 |
4231 | 85 | ======= | ||
4232 | 86 | #: ../data/apt_check.py:117 | ||
4233 | 87 | msgid "To see these additional updates run: apt list --upgradable" | ||
4234 | 88 | msgstr "" | ||
4235 | 89 | |||
4236 | 90 | #: ../data/apt_check.py:124 | ||
4237 | 91 | >>>>>>> po/bs.po | ||
4238 | 65 | #, python-format | 92 | #, python-format |
4239 | 66 | msgid "Enable UA Infra: ESM to receive %i additional security update." | 93 | msgid "Enable UA Infra: ESM to receive %i additional security update." |
4240 | 67 | msgid_plural "Enable UA Infra: ESM to receive %i additional security updates." | 94 | msgid_plural "Enable UA Infra: ESM to receive %i additional security updates." |
4241 | @@ -69,6 +96,7 @@ msgstr[0] "" | |||
4242 | 69 | msgstr[1] "" | 96 | msgstr[1] "" |
4243 | 70 | msgstr[2] "" | 97 | msgstr[2] "" |
4244 | 71 | 98 | ||
4245 | 99 | <<<<<<< po/bs.po | ||
4246 | 72 | #: ../data/apt_check.py:137 | 100 | #: ../data/apt_check.py:137 |
4247 | 73 | msgid "Enable UA Infra: ESM to receive additional future security updates." | 101 | msgid "Enable UA Infra: ESM to receive additional future security updates." |
4248 | 74 | msgstr "" | 102 | msgstr "" |
4249 | @@ -78,19 +106,39 @@ msgid "See https://ubuntu.com/security/esm or run: sudo ua status" | |||
4250 | 78 | msgstr "" | 106 | msgstr "" |
4251 | 79 | 107 | ||
4252 | 80 | #: ../data/apt_check.py:184 | 108 | #: ../data/apt_check.py:184 |
4253 | 109 | ======= | ||
4254 | 110 | #: ../data/apt_check.py:135 | ||
4255 | 111 | msgid "Enable UA Infra: ESM to receive additional future security updates." | ||
4256 | 112 | msgstr "" | ||
4257 | 113 | |||
4258 | 114 | #: ../data/apt_check.py:140 | ||
4259 | 115 | msgid "See https://ubuntu.com/security/esm or run: sudo ua status" | ||
4260 | 116 | msgstr "" | ||
4261 | 117 | |||
4262 | 118 | #: ../data/apt_check.py:182 | ||
4263 | 119 | >>>>>>> po/bs.po | ||
4264 | 81 | #, python-format | 120 | #, python-format |
4265 | 82 | msgid "Error: Opening the cache (%s)" | 121 | msgid "Error: Opening the cache (%s)" |
4266 | 83 | msgstr "Greška: Otvaram keš (%s)" | 122 | msgstr "Greška: Otvaram keš (%s)" |
4267 | 84 | 123 | ||
4268 | 124 | <<<<<<< po/bs.po | ||
4269 | 85 | #: ../data/apt_check.py:194 | 125 | #: ../data/apt_check.py:194 |
4270 | 86 | msgid "Error: BrokenCount > 0" | 126 | msgid "Error: BrokenCount > 0" |
4271 | 87 | msgstr "Greška: BrokenCount > 0" | 127 | msgstr "Greška: BrokenCount > 0" |
4272 | 88 | 128 | ||
4273 | 89 | #: ../data/apt_check.py:201 | 129 | #: ../data/apt_check.py:201 |
4274 | 130 | ======= | ||
4275 | 131 | #: ../data/apt_check.py:192 | ||
4276 | 132 | msgid "Error: BrokenCount > 0" | ||
4277 | 133 | msgstr "Greška: BrokenCount > 0" | ||
4278 | 134 | |||
4279 | 135 | #: ../data/apt_check.py:199 | ||
4280 | 136 | >>>>>>> po/bs.po | ||
4281 | 90 | #, python-format | 137 | #, python-format |
4282 | 91 | msgid "Error: Marking the upgrade (%s)" | 138 | msgid "Error: Marking the upgrade (%s)" |
4283 | 92 | msgstr "Greška: Obiljžavanje nadogradnje (%s)" | 139 | msgstr "Greška: Obiljžavanje nadogradnje (%s)" |
4284 | 93 | 140 | ||
4285 | 141 | <<<<<<< po/bs.po | ||
4286 | 94 | #: ../data/apt_check.py:310 | 142 | #: ../data/apt_check.py:310 |
4287 | 95 | msgid "Show the packages that are going to be installed/upgraded" | 143 | msgid "Show the packages that are going to be installed/upgraded" |
4288 | 96 | msgstr "Pokaži pakete koji će biti instalirani/nadograđeni" | 144 | msgstr "Pokaži pakete koji će biti instalirani/nadograđeni" |
4289 | @@ -100,6 +148,17 @@ msgid "Show human readable output on stdout" | |||
4290 | 100 | msgstr "Prikaži čitljiv izlaz na stdout" | 148 | msgstr "Prikaži čitljiv izlaz na stdout" |
4291 | 101 | 149 | ||
4292 | 102 | #: ../data/apt_check.py:320 | 150 | #: ../data/apt_check.py:320 |
4293 | 151 | ======= | ||
4294 | 152 | #: ../data/apt_check.py:309 | ||
4295 | 153 | msgid "Show the packages that are going to be installed/upgraded" | ||
4296 | 154 | msgstr "Pokaži pakete koji će biti instalirani/nadograđeni" | ||
4297 | 155 | |||
4298 | 156 | #: ../data/apt_check.py:315 | ||
4299 | 157 | msgid "Show human readable output on stdout" | ||
4300 | 158 | msgstr "Prikaži čitljiv izlaz na stdout" | ||
4301 | 159 | |||
4302 | 160 | #: ../data/apt_check.py:319 | ||
4303 | 161 | >>>>>>> po/bs.po | ||
4304 | 103 | msgid "" | 162 | msgid "" |
4305 | 104 | "Return the time in days when security updates are installed unattended (0 " | 163 | "Return the time in days when security updates are installed unattended (0 " |
4306 | 105 | "means disabled)" | 164 | "means disabled)" |
4307 | @@ -131,6 +190,23 @@ msgstr "" | |||
4308 | 131 | "Neki program je pao na vašem sistemu (sada ili u prošlosti). Kliknite na " | 190 | "Neki program je pao na vašem sistemu (sada ili u prošlosti). Kliknite na " |
4309 | 132 | "ikonu obavještenja da vidite detalje. " | 191 | "ikonu obavještenja da vidite detalje. " |
4310 | 133 | 192 | ||
4311 | 193 | <<<<<<< po/bs.po | ||
4312 | 194 | ======= | ||
4313 | 195 | #. Create and show the notification | ||
4314 | 196 | #: ../src/avahi.c:16 | ||
4315 | 197 | msgid "Network service discovery disabled" | ||
4316 | 198 | msgstr "Iksljučeno je otkrivanje mrežnih usluga" | ||
4317 | 199 | |||
4318 | 200 | #: ../src/avahi.c:17 | ||
4319 | 201 | msgid "" | ||
4320 | 202 | "Your current network has a .local domain, which is not recommended and " | ||
4321 | 203 | "incompatible with the Avahi network service discovery. The service has been " | ||
4322 | 204 | "disabled." | ||
4323 | 205 | msgstr "" | ||
4324 | 206 | "Vaša trenutna mreža je u .local domenu, što se ne preporučuje i u " | ||
4325 | 207 | "nesaglasnosti je sa otkrivanjem mrežnih usluga Avahi. Usluga je isključena." | ||
4326 | 208 | |||
4327 | 209 | >>>>>>> po/bs.po | ||
4328 | 134 | #: ../src/cdroms.c:48 | 210 | #: ../src/cdroms.c:48 |
4329 | 135 | msgid "Software Packages Volume Detected" | 211 | msgid "Software Packages Volume Detected" |
4330 | 136 | msgstr "Detektovan je disk sa programskim paketima" | 212 | msgstr "Detektovan je disk sa programskim paketima" |
4331 | @@ -224,9 +300,14 @@ msgid "No current updates" | |||
4332 | 224 | msgstr "- informacije o unaprjeđenjima" | 300 | msgstr "- informacije o unaprjeđenjima" |
4333 | 225 | 301 | ||
4334 | 226 | #: ../src/livepatch-tray.c:148 | 302 | #: ../src/livepatch-tray.c:148 |
4335 | 303 | <<<<<<< po/bs.po | ||
4336 | 227 | #, c-format | 304 | #, c-format |
4337 | 228 | msgid "%zd current update" | 305 | msgid "%zd current update" |
4338 | 229 | msgid_plural "%zd current updates" | 306 | msgid_plural "%zd current updates" |
4339 | 307 | ======= | ||
4340 | 308 | msgid "%" | ||
4341 | 309 | msgid_plural "%" | ||
4342 | 310 | >>>>>>> po/bs.po | ||
4343 | 230 | msgstr[0] "" | 311 | msgstr[0] "" |
4344 | 231 | msgstr[1] "" | 312 | msgstr[1] "" |
4345 | 232 | msgstr[2] "" | 313 | msgstr[2] "" |
4346 | @@ -334,20 +415,36 @@ msgstr "" | |||
4347 | 334 | msgid "A problem occurred when checking for the updates." | 415 | msgid "A problem occurred when checking for the updates." |
4348 | 335 | msgstr "Desio se problem u toku provjere nadogradnji." | 416 | msgstr "Desio se problem u toku provjere nadogradnji." |
4349 | 336 | 417 | ||
4350 | 418 | <<<<<<< po/bs.po | ||
4351 | 337 | #: ../src/update-notifier.c:560 | 419 | #: ../src/update-notifier.c:560 |
4352 | 338 | msgid "- inform about updates" | 420 | msgid "- inform about updates" |
4353 | 339 | msgstr "- informacije o unaprjeđenjima" | 421 | msgstr "- informacije o unaprjeđenjima" |
4354 | 340 | 422 | ||
4355 | 341 | #: ../src/update-notifier.c:562 | 423 | #: ../src/update-notifier.c:562 |
4356 | 424 | ======= | ||
4357 | 425 | #: ../src/update-notifier.c:585 | ||
4358 | 426 | msgid "- inform about updates" | ||
4359 | 427 | msgstr "- informacije o unaprjeđenjima" | ||
4360 | 428 | |||
4361 | 429 | #: ../src/update-notifier.c:587 | ||
4362 | 430 | >>>>>>> po/bs.po | ||
4363 | 342 | #, c-format | 431 | #, c-format |
4364 | 343 | msgid "Failed to init the UI: %s\n" | 432 | msgid "Failed to init the UI: %s\n" |
4365 | 344 | msgstr "Započinjanje Korisničkog Sučelja nije uspjelo: %s\n" | 433 | msgstr "Započinjanje Korisničkog Sučelja nije uspjelo: %s\n" |
4366 | 345 | 434 | ||
4367 | 435 | <<<<<<< po/bs.po | ||
4368 | 346 | #: ../src/update-notifier.c:563 | 436 | #: ../src/update-notifier.c:563 |
4369 | 347 | msgid "unknown error" | 437 | msgid "unknown error" |
4370 | 348 | msgstr "nepoznata greška" | 438 | msgstr "nepoznata greška" |
4371 | 349 | 439 | ||
4372 | 350 | #: ../src/update-notifier.c:590 | 440 | #: ../src/update-notifier.c:590 |
4373 | 441 | ======= | ||
4374 | 442 | #: ../src/update-notifier.c:588 | ||
4375 | 443 | msgid "unknown error" | ||
4376 | 444 | msgstr "nepoznata greška" | ||
4377 | 445 | |||
4378 | 446 | #: ../src/update-notifier.c:615 | ||
4379 | 447 | >>>>>>> po/bs.po | ||
4380 | 351 | msgid "update-notifier" | 448 | msgid "update-notifier" |
4381 | 352 | msgstr "obavještavač o dopunama" | 449 | msgstr "obavještavač o dopunama" |
4382 | 353 | 450 | ||
4383 | @@ -417,12 +514,15 @@ msgstr "" | |||
4384 | 417 | "sistemu. Morate popraviti Internet konekciju, ukloniti i reinstalirati " | 514 | "sistemu. Morate popraviti Internet konekciju, ukloniti i reinstalirati " |
4385 | 418 | "pakete da popravite problem." | 515 | "pakete da popravite problem." |
4386 | 419 | 516 | ||
4387 | 517 | <<<<<<< po/bs.po | ||
4388 | 420 | #~ msgid "%i package can be updated." | 518 | #~ msgid "%i package can be updated." |
4389 | 421 | #~ msgid_plural "%i packages can be updated." | 519 | #~ msgid_plural "%i packages can be updated." |
4390 | 422 | #~ msgstr[0] "%i paket može biti osvježen" | 520 | #~ msgstr[0] "%i paket može biti osvježen" |
4391 | 423 | #~ msgstr[1] "%i paketa mogu biti osvježena" | 521 | #~ msgstr[1] "%i paketa mogu biti osvježena" |
4392 | 424 | #~ msgstr[2] "%i paketa može biti osvježeno" | 522 | #~ msgstr[2] "%i paketa može biti osvježeno" |
4393 | 425 | 523 | ||
4394 | 524 | ======= | ||
4395 | 525 | >>>>>>> po/bs.po | ||
4396 | 426 | #~ msgid "" | 526 | #~ msgid "" |
4397 | 427 | #~ "<span weight=\"bold\" size=\"larger\">Please enter your password to " | 527 | #~ "<span weight=\"bold\" size=\"larger\">Please enter your password to " |
4398 | 428 | #~ "access problem reports of system programs</span>" | 528 | #~ "access problem reports of system programs</span>" |
4399 | @@ -430,6 +530,7 @@ msgstr "" | |||
4400 | 430 | #~ "<span weight=\"bold\" size=\"larger\">Unesite vašu lozinku da pristupite " | 530 | #~ "<span weight=\"bold\" size=\"larger\">Unesite vašu lozinku da pristupite " |
4401 | 431 | #~ "prijavljivanju problema sistemskih programa</span>" | 531 | #~ "prijavljivanju problema sistemskih programa</span>" |
4402 | 432 | 532 | ||
4403 | 533 | <<<<<<< po/bs.po | ||
4404 | 433 | #~ msgid "Network service discovery disabled" | 534 | #~ msgid "Network service discovery disabled" |
4405 | 434 | #~ msgstr "Iksljučeno je otkrivanje mrežnih usluga" | 535 | #~ msgstr "Iksljučeno je otkrivanje mrežnih usluga" |
4406 | 435 | 536 | ||
4407 | @@ -442,6 +543,8 @@ msgstr "" | |||
4408 | 442 | #~ "nesaglasnosti je sa otkrivanjem mrežnih usluga Avahi. Usluga je " | 543 | #~ "nesaglasnosti je sa otkrivanjem mrežnih usluga Avahi. Usluga je " |
4409 | 443 | #~ "isključena." | 544 | #~ "isključena." |
4410 | 444 | 545 | ||
4411 | 546 | ======= | ||
4412 | 547 | >>>>>>> po/bs.po | ||
4413 | 445 | #~ msgid "Addon volume detected" | 548 | #~ msgid "Addon volume detected" |
4414 | 446 | #~ msgstr "Primjećen je disk sa dodacima" | 549 | #~ msgstr "Primjećen je disk sa dodacima" |
4415 | 447 | 550 | ||
4416 | diff --git a/po/ca.po b/po/ca.po | |||
4417 | index 16b181d..3021c92 100644 | |||
4418 | --- a/po/ca.po | |||
4419 | +++ b/po/ca.po | |||
4420 | @@ -7,7 +7,11 @@ msgid "" | |||
4421 | 7 | msgstr "" | 7 | msgstr "" |
4422 | 8 | "Project-Id-Version: update-notifier\n" | 8 | "Project-Id-Version: update-notifier\n" |
4423 | 9 | "Report-Msgid-Bugs-To: \n" | 9 | "Report-Msgid-Bugs-To: \n" |
4424 | 10 | <<<<<<< po/ca.po | ||
4425 | 10 | "POT-Creation-Date: 2020-11-12 23:53+0000\n" | 11 | "POT-Creation-Date: 2020-11-12 23:53+0000\n" |
4426 | 12 | ======= | ||
4427 | 13 | "POT-Creation-Date: 2020-11-19 05:20+0000\n" | ||
4428 | 14 | >>>>>>> po/ca.po | ||
4429 | 11 | "PO-Revision-Date: 2012-04-16 13:09+0000\n" | 15 | "PO-Revision-Date: 2012-04-16 13:09+0000\n" |
4430 | 12 | "Last-Translator: Joan Duran <jodufi@gmail.com>\n" | 16 | "Last-Translator: Joan Duran <jodufi@gmail.com>\n" |
4431 | 13 | "Language-Team: Catalan <ca@li.org>\n" | 17 | "Language-Team: Catalan <ca@li.org>\n" |
4432 | @@ -33,6 +37,7 @@ msgid "UA Infra: Extended Security Maintenance (ESM) is not enabled." | |||
4433 | 33 | msgstr "" | 37 | msgstr "" |
4434 | 34 | 38 | ||
4435 | 35 | #: ../data/apt_check.py:93 | 39 | #: ../data/apt_check.py:93 |
4436 | 40 | <<<<<<< po/ca.po | ||
4437 | 36 | #, fuzzy, python-format | 41 | #, fuzzy, python-format |
4438 | 37 | msgid "%i update can be installed immediately." | 42 | msgid "%i update can be installed immediately." |
4439 | 38 | msgid_plural "%i updates can be installed immediately." | 43 | msgid_plural "%i updates can be installed immediately." |
4440 | @@ -40,30 +45,52 @@ msgstr[0] "%i actualització és una actualització de seguretat." | |||
4441 | 40 | msgstr[1] "%i actualitzacions són actualitzacions de seguretat." | 45 | msgstr[1] "%i actualitzacions són actualitzacions de seguretat." |
4442 | 41 | 46 | ||
4443 | 42 | #: ../data/apt_check.py:101 | 47 | #: ../data/apt_check.py:101 |
4444 | 48 | ======= | ||
4445 | 49 | #, python-format | ||
4446 | 50 | msgid "%i package can be updated." | ||
4447 | 51 | msgid_plural "%i packages can be updated." | ||
4448 | 52 | msgstr[0] "Podeu actualitzar %i paquet." | ||
4449 | 53 | msgstr[1] "Podeu actualitzar %i paquets." | ||
4450 | 54 | |||
4451 | 55 | #: ../data/apt_check.py:99 | ||
4452 | 56 | >>>>>>> po/ca.po | ||
4453 | 43 | #, python-format | 57 | #, python-format |
4454 | 44 | msgid "%i of these updates is fixed through UA Infra: ESM." | 58 | msgid "%i of these updates is fixed through UA Infra: ESM." |
4455 | 45 | msgid_plural "%i of these updates are fixed through UA Infra: ESM." | 59 | msgid_plural "%i of these updates are fixed through UA Infra: ESM." |
4456 | 46 | msgstr[0] "" | 60 | msgstr[0] "" |
4457 | 47 | msgstr[1] "" | 61 | msgstr[1] "" |
4458 | 48 | 62 | ||
4459 | 63 | <<<<<<< po/ca.po | ||
4460 | 49 | #: ../data/apt_check.py:110 | 64 | #: ../data/apt_check.py:110 |
4461 | 65 | ======= | ||
4462 | 66 | #: ../data/apt_check.py:108 | ||
4463 | 67 | >>>>>>> po/ca.po | ||
4464 | 50 | #, fuzzy, python-format | 68 | #, fuzzy, python-format |
4465 | 51 | msgid "%i of these updates is a security update." | 69 | msgid "%i of these updates is a security update." |
4466 | 52 | msgid_plural "%i of these updates are security updates." | 70 | msgid_plural "%i of these updates are security updates." |
4467 | 53 | msgstr[0] "%i actualització és una actualització de seguretat." | 71 | msgstr[0] "%i actualització és una actualització de seguretat." |
4468 | 54 | msgstr[1] "%i actualitzacions són actualitzacions de seguretat." | 72 | msgstr[1] "%i actualitzacions són actualitzacions de seguretat." |
4469 | 55 | 73 | ||
4470 | 74 | <<<<<<< po/ca.po | ||
4471 | 56 | #: ../data/apt_check.py:119 | 75 | #: ../data/apt_check.py:119 |
4472 | 57 | msgid "To see these additional updates run: apt list --upgradable" | 76 | msgid "To see these additional updates run: apt list --upgradable" |
4473 | 58 | msgstr "" | 77 | msgstr "" |
4474 | 59 | 78 | ||
4475 | 60 | #: ../data/apt_check.py:126 | 79 | #: ../data/apt_check.py:126 |
4476 | 80 | ======= | ||
4477 | 81 | #: ../data/apt_check.py:117 | ||
4478 | 82 | msgid "To see these additional updates run: apt list --upgradable" | ||
4479 | 83 | msgstr "" | ||
4480 | 84 | |||
4481 | 85 | #: ../data/apt_check.py:124 | ||
4482 | 86 | >>>>>>> po/ca.po | ||
4483 | 61 | #, python-format | 87 | #, python-format |
4484 | 62 | msgid "Enable UA Infra: ESM to receive %i additional security update." | 88 | msgid "Enable UA Infra: ESM to receive %i additional security update." |
4485 | 63 | msgid_plural "Enable UA Infra: ESM to receive %i additional security updates." | 89 | msgid_plural "Enable UA Infra: ESM to receive %i additional security updates." |
4486 | 64 | msgstr[0] "" | 90 | msgstr[0] "" |
4487 | 65 | msgstr[1] "" | 91 | msgstr[1] "" |
4488 | 66 | 92 | ||
4489 | 93 | <<<<<<< po/ca.po | ||
4490 | 67 | #: ../data/apt_check.py:137 | 94 | #: ../data/apt_check.py:137 |
4491 | 68 | msgid "Enable UA Infra: ESM to receive additional future security updates." | 95 | msgid "Enable UA Infra: ESM to receive additional future security updates." |
4492 | 69 | msgstr "" | 96 | msgstr "" |
4493 | @@ -73,19 +100,39 @@ msgid "See https://ubuntu.com/security/esm or run: sudo ua status" | |||
4494 | 73 | msgstr "" | 100 | msgstr "" |
4495 | 74 | 101 | ||
4496 | 75 | #: ../data/apt_check.py:184 | 102 | #: ../data/apt_check.py:184 |
4497 | 103 | ======= | ||
4498 | 104 | #: ../data/apt_check.py:135 | ||
4499 | 105 | msgid "Enable UA Infra: ESM to receive additional future security updates." | ||
4500 | 106 | msgstr "" | ||
4501 | 107 | |||
4502 | 108 | #: ../data/apt_check.py:140 | ||
4503 | 109 | msgid "See https://ubuntu.com/security/esm or run: sudo ua status" | ||
4504 | 110 | msgstr "" | ||
4505 | 111 | |||
4506 | 112 | #: ../data/apt_check.py:182 | ||
4507 | 113 | >>>>>>> po/ca.po | ||
4508 | 76 | #, python-format | 114 | #, python-format |
4509 | 77 | msgid "Error: Opening the cache (%s)" | 115 | msgid "Error: Opening the cache (%s)" |
4510 | 78 | msgstr "S'ha produït un error en obrir la memòria cau (%s)" | 116 | msgstr "S'ha produït un error en obrir la memòria cau (%s)" |
4511 | 79 | 117 | ||
4512 | 118 | <<<<<<< po/ca.po | ||
4513 | 80 | #: ../data/apt_check.py:194 | 119 | #: ../data/apt_check.py:194 |
4514 | 81 | msgid "Error: BrokenCount > 0" | 120 | msgid "Error: BrokenCount > 0" |
4515 | 82 | msgstr "S'ha produït un error: BrokenCount > 0" | 121 | msgstr "S'ha produït un error: BrokenCount > 0" |
4516 | 83 | 122 | ||
4517 | 84 | #: ../data/apt_check.py:201 | 123 | #: ../data/apt_check.py:201 |
4518 | 124 | ======= | ||
4519 | 125 | #: ../data/apt_check.py:192 | ||
4520 | 126 | msgid "Error: BrokenCount > 0" | ||
4521 | 127 | msgstr "S'ha produït un error: BrokenCount > 0" | ||
4522 | 128 | |||
4523 | 129 | #: ../data/apt_check.py:199 | ||
4524 | 130 | >>>>>>> po/ca.po | ||
4525 | 85 | #, python-format | 131 | #, python-format |
4526 | 86 | msgid "Error: Marking the upgrade (%s)" | 132 | msgid "Error: Marking the upgrade (%s)" |
4527 | 87 | msgstr "S'ha produït un error en marcar l'actualització (%s)" | 133 | msgstr "S'ha produït un error en marcar l'actualització (%s)" |
4528 | 88 | 134 | ||
4529 | 135 | <<<<<<< po/ca.po | ||
4530 | 89 | #: ../data/apt_check.py:310 | 136 | #: ../data/apt_check.py:310 |
4531 | 90 | msgid "Show the packages that are going to be installed/upgraded" | 137 | msgid "Show the packages that are going to be installed/upgraded" |
4532 | 91 | msgstr "Mostra els paquets que s'instal·laran o s'actualitzaran" | 138 | msgstr "Mostra els paquets que s'instal·laran o s'actualitzaran" |
4533 | @@ -95,6 +142,17 @@ msgid "Show human readable output on stdout" | |||
4534 | 95 | msgstr "Mostra una sortida llegible per a la sortida estàndard" | 142 | msgstr "Mostra una sortida llegible per a la sortida estàndard" |
4535 | 96 | 143 | ||
4536 | 97 | #: ../data/apt_check.py:320 | 144 | #: ../data/apt_check.py:320 |
4537 | 145 | ======= | ||
4538 | 146 | #: ../data/apt_check.py:309 | ||
4539 | 147 | msgid "Show the packages that are going to be installed/upgraded" | ||
4540 | 148 | msgstr "Mostra els paquets que s'instal·laran o s'actualitzaran" | ||
4541 | 149 | |||
4542 | 150 | #: ../data/apt_check.py:315 | ||
4543 | 151 | msgid "Show human readable output on stdout" | ||
4544 | 152 | msgstr "Mostra una sortida llegible per a la sortida estàndard" | ||
4545 | 153 | |||
4546 | 154 | #: ../data/apt_check.py:319 | ||
4547 | 155 | >>>>>>> po/ca.po | ||
4548 | 98 | msgid "" | 156 | msgid "" |
4549 | 99 | "Return the time in days when security updates are installed unattended (0 " | 157 | "Return the time in days when security updates are installed unattended (0 " |
4550 | 100 | "means disabled)" | 158 | "means disabled)" |
4551 | @@ -126,6 +184,24 @@ msgstr "" | |||
4552 | 126 | "Una aplicació del sistema ha fallat (ara o anteriorment). Feu clic a la " | 184 | "Una aplicació del sistema ha fallat (ara o anteriorment). Feu clic a la " |
4553 | 127 | "icona de notificació per a visualitzar-ne els detalls. " | 185 | "icona de notificació per a visualitzar-ne els detalls. " |
4554 | 128 | 186 | ||
4555 | 187 | <<<<<<< po/ca.po | ||
4556 | 188 | ======= | ||
4557 | 189 | #. Create and show the notification | ||
4558 | 190 | #: ../src/avahi.c:16 | ||
4559 | 191 | msgid "Network service discovery disabled" | ||
4560 | 192 | msgstr "El servei de descoberta de serveis a la xarxa està inhabilitat" | ||
4561 | 193 | |||
4562 | 194 | #: ../src/avahi.c:17 | ||
4563 | 195 | msgid "" | ||
4564 | 196 | "Your current network has a .local domain, which is not recommended and " | ||
4565 | 197 | "incompatible with the Avahi network service discovery. The service has been " | ||
4566 | 198 | "disabled." | ||
4567 | 199 | msgstr "" | ||
4568 | 200 | "La vostra xarxa actual té un domini .local, que no és recomanat i és " | ||
4569 | 201 | "incompatible amb la descoberta de serveis a la xarxa Avahi. S'ha inhabilitat " | ||
4570 | 202 | "el servei." | ||
4571 | 203 | |||
4572 | 204 | >>>>>>> po/ca.po | ||
4573 | 129 | #: ../src/cdroms.c:48 | 205 | #: ../src/cdroms.c:48 |
4574 | 130 | msgid "Software Packages Volume Detected" | 206 | msgid "Software Packages Volume Detected" |
4575 | 131 | msgstr "S'ha detectat un volum de paquets de programari" | 207 | msgstr "S'ha detectat un volum de paquets de programari" |
4576 | @@ -222,9 +298,14 @@ msgid "No current updates" | |||
4577 | 222 | msgstr "- informa sobre les actualitzacions" | 298 | msgstr "- informa sobre les actualitzacions" |
4578 | 223 | 299 | ||
4579 | 224 | #: ../src/livepatch-tray.c:148 | 300 | #: ../src/livepatch-tray.c:148 |
4580 | 301 | <<<<<<< po/ca.po | ||
4581 | 225 | #, c-format | 302 | #, c-format |
4582 | 226 | msgid "%zd current update" | 303 | msgid "%zd current update" |
4583 | 227 | msgid_plural "%zd current updates" | 304 | msgid_plural "%zd current updates" |
4584 | 305 | ======= | ||
4585 | 306 | msgid "%" | ||
4586 | 307 | msgid_plural "%" | ||
4587 | 308 | >>>>>>> po/ca.po | ||
4588 | 228 | msgstr[0] "" | 309 | msgstr[0] "" |
4589 | 229 | msgstr[1] "" | 310 | msgstr[1] "" |
4590 | 230 | 311 | ||
4591 | @@ -330,20 +411,36 @@ msgstr "" | |||
4592 | 330 | msgid "A problem occurred when checking for the updates." | 411 | msgid "A problem occurred when checking for the updates." |
4593 | 331 | msgstr "S'ha produït un error en comprovar les actualitzacions." | 412 | msgstr "S'ha produït un error en comprovar les actualitzacions." |
4594 | 332 | 413 | ||
4595 | 414 | <<<<<<< po/ca.po | ||
4596 | 333 | #: ../src/update-notifier.c:560 | 415 | #: ../src/update-notifier.c:560 |
4597 | 334 | msgid "- inform about updates" | 416 | msgid "- inform about updates" |
4598 | 335 | msgstr "- informa sobre les actualitzacions" | 417 | msgstr "- informa sobre les actualitzacions" |
4599 | 336 | 418 | ||
4600 | 337 | #: ../src/update-notifier.c:562 | 419 | #: ../src/update-notifier.c:562 |
4601 | 420 | ======= | ||
4602 | 421 | #: ../src/update-notifier.c:585 | ||
4603 | 422 | msgid "- inform about updates" | ||
4604 | 423 | msgstr "- informa sobre les actualitzacions" | ||
4605 | 424 | |||
4606 | 425 | #: ../src/update-notifier.c:587 | ||
4607 | 426 | >>>>>>> po/ca.po | ||
4608 | 338 | #, c-format | 427 | #, c-format |
4609 | 339 | msgid "Failed to init the UI: %s\n" | 428 | msgid "Failed to init the UI: %s\n" |
4610 | 340 | msgstr "Ha fallat la inicialització de la interfície d'usuari: %s\n" | 429 | msgstr "Ha fallat la inicialització de la interfície d'usuari: %s\n" |
4611 | 341 | 430 | ||
4612 | 431 | <<<<<<< po/ca.po | ||
4613 | 342 | #: ../src/update-notifier.c:563 | 432 | #: ../src/update-notifier.c:563 |
4614 | 343 | msgid "unknown error" | 433 | msgid "unknown error" |
4615 | 344 | msgstr "error desconegut" | 434 | msgstr "error desconegut" |
4616 | 345 | 435 | ||
4617 | 346 | #: ../src/update-notifier.c:590 | 436 | #: ../src/update-notifier.c:590 |
4618 | 437 | ======= | ||
4619 | 438 | #: ../src/update-notifier.c:588 | ||
4620 | 439 | msgid "unknown error" | ||
4621 | 440 | msgstr "error desconegut" | ||
4622 | 441 | |||
4623 | 442 | #: ../src/update-notifier.c:615 | ||
4624 | 443 | >>>>>>> po/ca.po | ||
4625 | 347 | msgid "update-notifier" | 444 | msgid "update-notifier" |
4626 | 348 | msgstr "indicador d'actualitzacions" | 445 | msgstr "indicador d'actualitzacions" |
4627 | 349 | 446 | ||
4628 | @@ -414,11 +511,14 @@ msgstr "" | |||
4629 | 414 | "vostre sistema. Heu d'arreglar la connexió a Internet, després suprimir i " | 511 | "vostre sistema. Heu d'arreglar la connexió a Internet, després suprimir i " |
4630 | 415 | "tornar a instal·lar els paquets per solucionar aquest problema." | 512 | "tornar a instal·lar els paquets per solucionar aquest problema." |
4631 | 416 | 513 | ||
4632 | 514 | <<<<<<< po/ca.po | ||
4633 | 417 | #~ msgid "%i package can be updated." | 515 | #~ msgid "%i package can be updated." |
4634 | 418 | #~ msgid_plural "%i packages can be updated." | 516 | #~ msgid_plural "%i packages can be updated." |
4635 | 419 | #~ msgstr[0] "Podeu actualitzar %i paquet." | 517 | #~ msgstr[0] "Podeu actualitzar %i paquet." |
4636 | 420 | #~ msgstr[1] "Podeu actualitzar %i paquets." | 518 | #~ msgstr[1] "Podeu actualitzar %i paquets." |
4637 | 421 | 519 | ||
4638 | 520 | ======= | ||
4639 | 521 | >>>>>>> po/ca.po | ||
4640 | 422 | #~ msgid "" | 522 | #~ msgid "" |
4641 | 423 | #~ "<span weight=\"bold\" size=\"larger\">Please enter your password to " | 523 | #~ "<span weight=\"bold\" size=\"larger\">Please enter your password to " |
4642 | 424 | #~ "access problem reports of system programs</span>" | 524 | #~ "access problem reports of system programs</span>" |
4643 | @@ -426,6 +526,7 @@ msgstr "" | |||
4644 | 426 | #~ "<span weight=\"bold\" size=\"larger\">Introduïu la contrasenya per a " | 526 | #~ "<span weight=\"bold\" size=\"larger\">Introduïu la contrasenya per a " |
4645 | 427 | #~ "accedir als informes de problemes dels programes del sistema</span>" | 527 | #~ "accedir als informes de problemes dels programes del sistema</span>" |
4646 | 428 | 528 | ||
4647 | 529 | <<<<<<< po/ca.po | ||
4648 | 429 | #~ msgid "Network service discovery disabled" | 530 | #~ msgid "Network service discovery disabled" |
4649 | 430 | #~ msgstr "El servei de descoberta de serveis a la xarxa està inhabilitat" | 531 | #~ msgstr "El servei de descoberta de serveis a la xarxa està inhabilitat" |
4650 | 431 | 532 | ||
4651 | @@ -438,6 +539,8 @@ msgstr "" | |||
4652 | 438 | #~ "incompatible amb la descoberta de serveis a la xarxa Avahi. S'ha " | 539 | #~ "incompatible amb la descoberta de serveis a la xarxa Avahi. S'ha " |
4653 | 439 | #~ "inhabilitat el servei." | 540 | #~ "inhabilitat el servei." |
4654 | 440 | 541 | ||
4655 | 542 | ======= | ||
4656 | 543 | >>>>>>> po/ca.po | ||
4657 | 441 | #~ msgid "Addon volume detected" | 544 | #~ msgid "Addon volume detected" |
4658 | 442 | #~ msgstr "S'ha detectat un volum de complements" | 545 | #~ msgstr "S'ha detectat un volum de complements" |
4659 | 443 | 546 | ||
4660 | diff --git a/po/ca@valencia.po b/po/ca@valencia.po | |||
4661 | index e510b43..80107dd 100644 | |||
4662 | --- a/po/ca@valencia.po | |||
4663 | +++ b/po/ca@valencia.po | |||
4664 | @@ -7,7 +7,11 @@ msgid "" | |||
4665 | 7 | msgstr "" | 7 | msgstr "" |
4666 | 8 | "Project-Id-Version: update-notifier\n" | 8 | "Project-Id-Version: update-notifier\n" |
4667 | 9 | "Report-Msgid-Bugs-To: \n" | 9 | "Report-Msgid-Bugs-To: \n" |
4668 | 10 | <<<<<<< po/ca@valencia.po | ||
4669 | 10 | "POT-Creation-Date: 2020-11-12 23:53+0000\n" | 11 | "POT-Creation-Date: 2020-11-12 23:53+0000\n" |
4670 | 12 | ======= | ||
4671 | 13 | "POT-Creation-Date: 2020-11-19 05:20+0000\n" | ||
4672 | 14 | >>>>>>> po/ca@valencia.po | ||
4673 | 11 | "PO-Revision-Date: 2012-10-19 09:35+0000\n" | 15 | "PO-Revision-Date: 2012-10-19 09:35+0000\n" |
4674 | 12 | "Last-Translator: Joan Duran <jodufi@gmail.com>\n" | 16 | "Last-Translator: Joan Duran <jodufi@gmail.com>\n" |
4675 | 13 | "Language-Team: Catalan <ca@li.org>\n" | 17 | "Language-Team: Catalan <ca@li.org>\n" |
4676 | @@ -33,6 +37,7 @@ msgid "UA Infra: Extended Security Maintenance (ESM) is not enabled." | |||
4677 | 33 | msgstr "" | 37 | msgstr "" |
4678 | 34 | 38 | ||
4679 | 35 | #: ../data/apt_check.py:93 | 39 | #: ../data/apt_check.py:93 |
4680 | 40 | <<<<<<< po/ca@valencia.po | ||
4681 | 36 | #, fuzzy, python-format | 41 | #, fuzzy, python-format |
4682 | 37 | msgid "%i update can be installed immediately." | 42 | msgid "%i update can be installed immediately." |
4683 | 38 | msgid_plural "%i updates can be installed immediately." | 43 | msgid_plural "%i updates can be installed immediately." |
4684 | @@ -40,30 +45,52 @@ msgstr[0] "%i actualització és una actualització de seguretat." | |||
4685 | 40 | msgstr[1] "%i actualitzacions són actualitzacions de seguretat." | 45 | msgstr[1] "%i actualitzacions són actualitzacions de seguretat." |
4686 | 41 | 46 | ||
4687 | 42 | #: ../data/apt_check.py:101 | 47 | #: ../data/apt_check.py:101 |
4688 | 48 | ======= | ||
4689 | 49 | #, python-format | ||
4690 | 50 | msgid "%i package can be updated." | ||
4691 | 51 | msgid_plural "%i packages can be updated." | ||
4692 | 52 | msgstr[0] "Podeu actualitzar %i paquet." | ||
4693 | 53 | msgstr[1] "Podeu actualitzar %i paquets." | ||
4694 | 54 | |||
4695 | 55 | #: ../data/apt_check.py:99 | ||
4696 | 56 | >>>>>>> po/ca@valencia.po | ||
4697 | 43 | #, python-format | 57 | #, python-format |
4698 | 44 | msgid "%i of these updates is fixed through UA Infra: ESM." | 58 | msgid "%i of these updates is fixed through UA Infra: ESM." |
4699 | 45 | msgid_plural "%i of these updates are fixed through UA Infra: ESM." | 59 | msgid_plural "%i of these updates are fixed through UA Infra: ESM." |
4700 | 46 | msgstr[0] "" | 60 | msgstr[0] "" |
4701 | 47 | msgstr[1] "" | 61 | msgstr[1] "" |
4702 | 48 | 62 | ||
4703 | 63 | <<<<<<< po/ca@valencia.po | ||
4704 | 49 | #: ../data/apt_check.py:110 | 64 | #: ../data/apt_check.py:110 |
4705 | 65 | ======= | ||
4706 | 66 | #: ../data/apt_check.py:108 | ||
4707 | 67 | >>>>>>> po/ca@valencia.po | ||
4708 | 50 | #, fuzzy, python-format | 68 | #, fuzzy, python-format |
4709 | 51 | msgid "%i of these updates is a security update." | 69 | msgid "%i of these updates is a security update." |
4710 | 52 | msgid_plural "%i of these updates are security updates." | 70 | msgid_plural "%i of these updates are security updates." |
4711 | 53 | msgstr[0] "%i actualització és una actualització de seguretat." | 71 | msgstr[0] "%i actualització és una actualització de seguretat." |
4712 | 54 | msgstr[1] "%i actualitzacions són actualitzacions de seguretat." | 72 | msgstr[1] "%i actualitzacions són actualitzacions de seguretat." |
4713 | 55 | 73 | ||
4714 | 74 | <<<<<<< po/ca@valencia.po | ||
4715 | 56 | #: ../data/apt_check.py:119 | 75 | #: ../data/apt_check.py:119 |
4716 | 57 | msgid "To see these additional updates run: apt list --upgradable" | 76 | msgid "To see these additional updates run: apt list --upgradable" |
4717 | 58 | msgstr "" | 77 | msgstr "" |
4718 | 59 | 78 | ||
4719 | 60 | #: ../data/apt_check.py:126 | 79 | #: ../data/apt_check.py:126 |
4720 | 80 | ======= | ||
4721 | 81 | #: ../data/apt_check.py:117 | ||
4722 | 82 | msgid "To see these additional updates run: apt list --upgradable" | ||
4723 | 83 | msgstr "" | ||
4724 | 84 | |||
4725 | 85 | #: ../data/apt_check.py:124 | ||
4726 | 86 | >>>>>>> po/ca@valencia.po | ||
4727 | 61 | #, python-format | 87 | #, python-format |
4728 | 62 | msgid "Enable UA Infra: ESM to receive %i additional security update." | 88 | msgid "Enable UA Infra: ESM to receive %i additional security update." |
4729 | 63 | msgid_plural "Enable UA Infra: ESM to receive %i additional security updates." | 89 | msgid_plural "Enable UA Infra: ESM to receive %i additional security updates." |
4730 | 64 | msgstr[0] "" | 90 | msgstr[0] "" |
4731 | 65 | msgstr[1] "" | 91 | msgstr[1] "" |
4732 | 66 | 92 | ||
4733 | 93 | <<<<<<< po/ca@valencia.po | ||
4734 | 67 | #: ../data/apt_check.py:137 | 94 | #: ../data/apt_check.py:137 |
4735 | 68 | msgid "Enable UA Infra: ESM to receive additional future security updates." | 95 | msgid "Enable UA Infra: ESM to receive additional future security updates." |
4736 | 69 | msgstr "" | 96 | msgstr "" |
4737 | @@ -73,19 +100,39 @@ msgid "See https://ubuntu.com/security/esm or run: sudo ua status" | |||
4738 | 73 | msgstr "" | 100 | msgstr "" |
4739 | 74 | 101 | ||
4740 | 75 | #: ../data/apt_check.py:184 | 102 | #: ../data/apt_check.py:184 |
4741 | 103 | ======= | ||
4742 | 104 | #: ../data/apt_check.py:135 | ||
4743 | 105 | msgid "Enable UA Infra: ESM to receive additional future security updates." | ||
4744 | 106 | msgstr "" | ||
4745 | 107 | |||
4746 | 108 | #: ../data/apt_check.py:140 | ||
4747 | 109 | msgid "See https://ubuntu.com/security/esm or run: sudo ua status" | ||
4748 | 110 | msgstr "" | ||
4749 | 111 | |||
4750 | 112 | #: ../data/apt_check.py:182 | ||
4751 | 113 | >>>>>>> po/ca@valencia.po | ||
4752 | 76 | #, python-format | 114 | #, python-format |
4753 | 77 | msgid "Error: Opening the cache (%s)" | 115 | msgid "Error: Opening the cache (%s)" |
4754 | 78 | msgstr "S'ha produït un error en obrir la memòria cau (%s)" | 116 | msgstr "S'ha produït un error en obrir la memòria cau (%s)" |
4755 | 79 | 117 | ||
4756 | 118 | <<<<<<< po/ca@valencia.po | ||
4757 | 80 | #: ../data/apt_check.py:194 | 119 | #: ../data/apt_check.py:194 |
4758 | 81 | msgid "Error: BrokenCount > 0" | 120 | msgid "Error: BrokenCount > 0" |
4759 | 82 | msgstr "S'ha produït un error: BrokenCount > 0" | 121 | msgstr "S'ha produït un error: BrokenCount > 0" |
4760 | 83 | 122 | ||
4761 | 84 | #: ../data/apt_check.py:201 | 123 | #: ../data/apt_check.py:201 |
4762 | 124 | ======= | ||
4763 | 125 | #: ../data/apt_check.py:192 | ||
4764 | 126 | msgid "Error: BrokenCount > 0" | ||
4765 | 127 | msgstr "S'ha produït un error: BrokenCount > 0" | ||
4766 | 128 | |||
4767 | 129 | #: ../data/apt_check.py:199 | ||
4768 | 130 | >>>>>>> po/ca@valencia.po | ||
4769 | 85 | #, python-format | 131 | #, python-format |
4770 | 86 | msgid "Error: Marking the upgrade (%s)" | 132 | msgid "Error: Marking the upgrade (%s)" |
4771 | 87 | msgstr "S'ha produït un error en marcar l'actualització (%s)" | 133 | msgstr "S'ha produït un error en marcar l'actualització (%s)" |
4772 | 88 | 134 | ||
4773 | 135 | <<<<<<< po/ca@valencia.po | ||
4774 | 89 | #: ../data/apt_check.py:310 | 136 | #: ../data/apt_check.py:310 |
4775 | 90 | msgid "Show the packages that are going to be installed/upgraded" | 137 | msgid "Show the packages that are going to be installed/upgraded" |
4776 | 91 | msgstr "Mostra els paquets que s'instal·laran o s'actualitzaran" | 138 | msgstr "Mostra els paquets que s'instal·laran o s'actualitzaran" |
4777 | @@ -95,6 +142,17 @@ msgid "Show human readable output on stdout" | |||
4778 | 95 | msgstr "Mostra una eixida llegible per a l'eixida estàndard" | 142 | msgstr "Mostra una eixida llegible per a l'eixida estàndard" |
4779 | 96 | 143 | ||
4780 | 97 | #: ../data/apt_check.py:320 | 144 | #: ../data/apt_check.py:320 |
4781 | 145 | ======= | ||
4782 | 146 | #: ../data/apt_check.py:309 | ||
4783 | 147 | msgid "Show the packages that are going to be installed/upgraded" | ||
4784 | 148 | msgstr "Mostra els paquets que s'instal·laran o s'actualitzaran" | ||
4785 | 149 | |||
4786 | 150 | #: ../data/apt_check.py:315 | ||
4787 | 151 | msgid "Show human readable output on stdout" | ||
4788 | 152 | msgstr "Mostra una eixida llegible per a l'eixida estàndard" | ||
4789 | 153 | |||
4790 | 154 | #: ../data/apt_check.py:319 | ||
4791 | 155 | >>>>>>> po/ca@valencia.po | ||
4792 | 98 | msgid "" | 156 | msgid "" |
4793 | 99 | "Return the time in days when security updates are installed unattended (0 " | 157 | "Return the time in days when security updates are installed unattended (0 " |
4794 | 100 | "means disabled)" | 158 | "means disabled)" |
4795 | @@ -126,6 +184,24 @@ msgstr "" | |||
4796 | 126 | "Una aplicació del sistema ha fallat (ara o anteriorment). Feu clic a la " | 184 | "Una aplicació del sistema ha fallat (ara o anteriorment). Feu clic a la " |
4797 | 127 | "icona de notificació per a visualitzar-ne els detalls. " | 185 | "icona de notificació per a visualitzar-ne els detalls. " |
4798 | 128 | 186 | ||
4799 | 187 | <<<<<<< po/ca@valencia.po | ||
4800 | 188 | ======= | ||
4801 | 189 | #. Create and show the notification | ||
4802 | 190 | #: ../src/avahi.c:16 | ||
4803 | 191 | msgid "Network service discovery disabled" | ||
4804 | 192 | msgstr "El servei de descoberta de serveis a la xarxa està inhabilitat" | ||
4805 | 193 | |||
4806 | 194 | #: ../src/avahi.c:17 | ||
4807 | 195 | msgid "" | ||
4808 | 196 | "Your current network has a .local domain, which is not recommended and " | ||
4809 | 197 | "incompatible with the Avahi network service discovery. The service has been " | ||
4810 | 198 | "disabled." | ||
4811 | 199 | msgstr "" | ||
4812 | 200 | "La vostra xarxa actual té un domini .local, que no és recomanat i és " | ||
4813 | 201 | "incompatible amb la descoberta de serveis a la xarxa Avahi. S'ha inhabilitat " | ||
4814 | 202 | "el servei." | ||
4815 | 203 | |||
4816 | 204 | >>>>>>> po/ca@valencia.po | ||
4817 | 129 | #: ../src/cdroms.c:48 | 205 | #: ../src/cdroms.c:48 |
4818 | 130 | msgid "Software Packages Volume Detected" | 206 | msgid "Software Packages Volume Detected" |
4819 | 131 | msgstr "S'ha detectat un volum de paquets de programari" | 207 | msgstr "S'ha detectat un volum de paquets de programari" |
4820 | @@ -222,9 +298,14 @@ msgid "No current updates" | |||
4821 | 222 | msgstr "- informa sobre les actualitzacions" | 298 | msgstr "- informa sobre les actualitzacions" |
4822 | 223 | 299 | ||
4823 | 224 | #: ../src/livepatch-tray.c:148 | 300 | #: ../src/livepatch-tray.c:148 |
4824 | 301 | <<<<<<< po/ca@valencia.po | ||
4825 | 225 | #, c-format | 302 | #, c-format |
4826 | 226 | msgid "%zd current update" | 303 | msgid "%zd current update" |
4827 | 227 | msgid_plural "%zd current updates" | 304 | msgid_plural "%zd current updates" |
4828 | 305 | ======= | ||
4829 | 306 | msgid "%" | ||
4830 | 307 | msgid_plural "%" | ||
4831 | 308 | >>>>>>> po/ca@valencia.po | ||
4832 | 228 | msgstr[0] "" | 309 | msgstr[0] "" |
4833 | 229 | msgstr[1] "" | 310 | msgstr[1] "" |
4834 | 230 | 311 | ||
4835 | @@ -330,20 +411,36 @@ msgstr "" | |||
4836 | 330 | msgid "A problem occurred when checking for the updates." | 411 | msgid "A problem occurred when checking for the updates." |
4837 | 331 | msgstr "S'ha produït un error en comprovar les actualitzacions." | 412 | msgstr "S'ha produït un error en comprovar les actualitzacions." |
4838 | 332 | 413 | ||
4839 | 414 | <<<<<<< po/ca@valencia.po | ||
4840 | 333 | #: ../src/update-notifier.c:560 | 415 | #: ../src/update-notifier.c:560 |
4841 | 334 | msgid "- inform about updates" | 416 | msgid "- inform about updates" |
4842 | 335 | msgstr "- informa sobre les actualitzacions" | 417 | msgstr "- informa sobre les actualitzacions" |
4843 | 336 | 418 | ||
4844 | 337 | #: ../src/update-notifier.c:562 | 419 | #: ../src/update-notifier.c:562 |
4845 | 420 | ======= | ||
4846 | 421 | #: ../src/update-notifier.c:585 | ||
4847 | 422 | msgid "- inform about updates" | ||
4848 | 423 | msgstr "- informa sobre les actualitzacions" | ||
4849 | 424 | |||
4850 | 425 | #: ../src/update-notifier.c:587 | ||
4851 | 426 | >>>>>>> po/ca@valencia.po | ||
4852 | 338 | #, c-format | 427 | #, c-format |
4853 | 339 | msgid "Failed to init the UI: %s\n" | 428 | msgid "Failed to init the UI: %s\n" |
4854 | 340 | msgstr "Ha fallat la inicialització de la interfície d'usuari: %s\n" | 429 | msgstr "Ha fallat la inicialització de la interfície d'usuari: %s\n" |
4855 | 341 | 430 | ||
4856 | 431 | <<<<<<< po/ca@valencia.po | ||
4857 | 342 | #: ../src/update-notifier.c:563 | 432 | #: ../src/update-notifier.c:563 |
4858 | 343 | msgid "unknown error" | 433 | msgid "unknown error" |
4859 | 344 | msgstr "error desconegut" | 434 | msgstr "error desconegut" |
4860 | 345 | 435 | ||
4861 | 346 | #: ../src/update-notifier.c:590 | 436 | #: ../src/update-notifier.c:590 |
4862 | 437 | ======= | ||
4863 | 438 | #: ../src/update-notifier.c:588 | ||
4864 | 439 | msgid "unknown error" | ||
4865 | 440 | msgstr "error desconegut" | ||
4866 | 441 | |||
4867 | 442 | #: ../src/update-notifier.c:615 | ||
4868 | 443 | >>>>>>> po/ca@valencia.po | ||
4869 | 347 | msgid "update-notifier" | 444 | msgid "update-notifier" |
4870 | 348 | msgstr "indicador d'actualitzacions" | 445 | msgstr "indicador d'actualitzacions" |
4871 | 349 | 446 | ||
4872 | @@ -414,11 +511,14 @@ msgstr "" | |||
4873 | 414 | "vostre sistema. Heu d'arreglar la connexió a Internet, després suprimir i " | 511 | "vostre sistema. Heu d'arreglar la connexió a Internet, després suprimir i " |
4874 | 415 | "tornar a instal·lar els paquets per solucionar este problema." | 512 | "tornar a instal·lar els paquets per solucionar este problema." |
4875 | 416 | 513 | ||
4876 | 514 | <<<<<<< po/ca@valencia.po | ||
4877 | 417 | #~ msgid "%i package can be updated." | 515 | #~ msgid "%i package can be updated." |
4878 | 418 | #~ msgid_plural "%i packages can be updated." | 516 | #~ msgid_plural "%i packages can be updated." |
4879 | 419 | #~ msgstr[0] "Podeu actualitzar %i paquet." | 517 | #~ msgstr[0] "Podeu actualitzar %i paquet." |
4880 | 420 | #~ msgstr[1] "Podeu actualitzar %i paquets." | 518 | #~ msgstr[1] "Podeu actualitzar %i paquets." |
4881 | 421 | 519 | ||
4882 | 520 | ======= | ||
4883 | 521 | >>>>>>> po/ca@valencia.po | ||
4884 | 422 | #~ msgid "" | 522 | #~ msgid "" |
4885 | 423 | #~ "<span weight=\"bold\" size=\"larger\">Please enter your password to " | 523 | #~ "<span weight=\"bold\" size=\"larger\">Please enter your password to " |
4886 | 424 | #~ "access problem reports of system programs</span>" | 524 | #~ "access problem reports of system programs</span>" |
4887 | @@ -426,6 +526,7 @@ msgstr "" | |||
4888 | 426 | #~ "<span weight=\"bold\" size=\"larger\">Introduïu la contrasenya per a " | 526 | #~ "<span weight=\"bold\" size=\"larger\">Introduïu la contrasenya per a " |
4889 | 427 | #~ "accedir als informes de problemes dels programes del sistema</span>" | 527 | #~ "accedir als informes de problemes dels programes del sistema</span>" |
4890 | 428 | 528 | ||
4891 | 529 | <<<<<<< po/ca@valencia.po | ||
4892 | 429 | #~ msgid "Network service discovery disabled" | 530 | #~ msgid "Network service discovery disabled" |
4893 | 430 | #~ msgstr "El servei de descoberta de serveis a la xarxa està inhabilitat" | 531 | #~ msgstr "El servei de descoberta de serveis a la xarxa està inhabilitat" |
4894 | 431 | 532 | ||
4895 | @@ -438,6 +539,8 @@ msgstr "" | |||
4896 | 438 | #~ "incompatible amb la descoberta de serveis a la xarxa Avahi. S'ha " | 539 | #~ "incompatible amb la descoberta de serveis a la xarxa Avahi. S'ha " |
4897 | 439 | #~ "inhabilitat el servei." | 540 | #~ "inhabilitat el servei." |
4898 | 440 | 541 | ||
4899 | 542 | ======= | ||
4900 | 543 | >>>>>>> po/ca@valencia.po | ||
4901 | 441 | #~ msgid "Addon volume detected" | 544 | #~ msgid "Addon volume detected" |
4902 | 442 | #~ msgstr "S'ha detectat un volum de complements" | 545 | #~ msgstr "S'ha detectat un volum de complements" |
4903 | 443 | 546 | ||
4904 | diff --git a/po/ckb.po b/po/ckb.po | |||
4905 | index 20ca21a..a5dee2f 100644 | |||
4906 | --- a/po/ckb.po | |||
4907 | +++ b/po/ckb.po | |||
4908 | @@ -7,7 +7,11 @@ msgid "" | |||
4909 | 7 | msgstr "" | 7 | msgstr "" |
4910 | 8 | "Project-Id-Version: update-notifier\n" | 8 | "Project-Id-Version: update-notifier\n" |
4911 | 9 | "Report-Msgid-Bugs-To: \n" | 9 | "Report-Msgid-Bugs-To: \n" |
4912 | 10 | <<<<<<< po/ckb.po | ||
4913 | 10 | "POT-Creation-Date: 2020-11-12 23:53+0000\n" | 11 | "POT-Creation-Date: 2020-11-12 23:53+0000\n" |
4914 | 12 | ======= | ||
4915 | 13 | "POT-Creation-Date: 2020-11-19 05:20+0000\n" | ||
4916 | 14 | >>>>>>> po/ckb.po | ||
4917 | 11 | "PO-Revision-Date: 2008-10-26 11:56+0000\n" | 15 | "PO-Revision-Date: 2008-10-26 11:56+0000\n" |
4918 | 12 | "Last-Translator: jwtear nariman <jwtiyar@gmail.com>\n" | 16 | "Last-Translator: jwtear nariman <jwtiyar@gmail.com>\n" |
4919 | 13 | "Language-Team: Kurdish (Sorani) <ckb@li.org>\n" | 17 | "Language-Team: Kurdish (Sorani) <ckb@li.org>\n" |
4920 | @@ -34,36 +38,58 @@ msgstr "" | |||
4921 | 34 | 38 | ||
4922 | 35 | #: ../data/apt_check.py:93 | 39 | #: ../data/apt_check.py:93 |
4923 | 36 | #, python-format | 40 | #, python-format |
4924 | 41 | <<<<<<< po/ckb.po | ||
4925 | 37 | msgid "%i update can be installed immediately." | 42 | msgid "%i update can be installed immediately." |
4926 | 38 | msgid_plural "%i updates can be installed immediately." | 43 | msgid_plural "%i updates can be installed immediately." |
4927 | 39 | msgstr[0] "" | 44 | msgstr[0] "" |
4928 | 40 | msgstr[1] "" | 45 | msgstr[1] "" |
4929 | 41 | 46 | ||
4930 | 42 | #: ../data/apt_check.py:101 | 47 | #: ../data/apt_check.py:101 |
4931 | 48 | ======= | ||
4932 | 49 | msgid "%i package can be updated." | ||
4933 | 50 | msgid_plural "%i packages can be updated." | ||
4934 | 51 | msgstr[0] "" | ||
4935 | 52 | msgstr[1] "" | ||
4936 | 53 | |||
4937 | 54 | #: ../data/apt_check.py:99 | ||
4938 | 55 | >>>>>>> po/ckb.po | ||
4939 | 43 | #, python-format | 56 | #, python-format |
4940 | 44 | msgid "%i of these updates is fixed through UA Infra: ESM." | 57 | msgid "%i of these updates is fixed through UA Infra: ESM." |
4941 | 45 | msgid_plural "%i of these updates are fixed through UA Infra: ESM." | 58 | msgid_plural "%i of these updates are fixed through UA Infra: ESM." |
4942 | 46 | msgstr[0] "" | 59 | msgstr[0] "" |
4943 | 47 | msgstr[1] "" | 60 | msgstr[1] "" |
4944 | 48 | 61 | ||
4945 | 62 | <<<<<<< po/ckb.po | ||
4946 | 49 | #: ../data/apt_check.py:110 | 63 | #: ../data/apt_check.py:110 |
4947 | 64 | ======= | ||
4948 | 65 | #: ../data/apt_check.py:108 | ||
4949 | 66 | >>>>>>> po/ckb.po | ||
4950 | 50 | #, python-format | 67 | #, python-format |
4951 | 51 | msgid "%i of these updates is a security update." | 68 | msgid "%i of these updates is a security update." |
4952 | 52 | msgid_plural "%i of these updates are security updates." | 69 | msgid_plural "%i of these updates are security updates." |
4953 | 53 | msgstr[0] "" | 70 | msgstr[0] "" |
4954 | 54 | msgstr[1] "" | 71 | msgstr[1] "" |
4955 | 55 | 72 | ||
4956 | 73 | <<<<<<< po/ckb.po | ||
4957 | 56 | #: ../data/apt_check.py:119 | 74 | #: ../data/apt_check.py:119 |
4958 | 57 | msgid "To see these additional updates run: apt list --upgradable" | 75 | msgid "To see these additional updates run: apt list --upgradable" |
4959 | 58 | msgstr "" | 76 | msgstr "" |
4960 | 59 | 77 | ||
4961 | 60 | #: ../data/apt_check.py:126 | 78 | #: ../data/apt_check.py:126 |
4962 | 79 | ======= | ||
4963 | 80 | #: ../data/apt_check.py:117 | ||
4964 | 81 | msgid "To see these additional updates run: apt list --upgradable" | ||
4965 | 82 | msgstr "" | ||
4966 | 83 | |||
4967 | 84 | #: ../data/apt_check.py:124 | ||
4968 | 85 | >>>>>>> po/ckb.po | ||
4969 | 61 | #, python-format | 86 | #, python-format |
4970 | 62 | msgid "Enable UA Infra: ESM to receive %i additional security update." | 87 | msgid "Enable UA Infra: ESM to receive %i additional security update." |
4971 | 63 | msgid_plural "Enable UA Infra: ESM to receive %i additional security updates." | 88 | msgid_plural "Enable UA Infra: ESM to receive %i additional security updates." |
4972 | 64 | msgstr[0] "" | 89 | msgstr[0] "" |
4973 | 65 | msgstr[1] "" | 90 | msgstr[1] "" |
4974 | 66 | 91 | ||
4975 | 92 | <<<<<<< po/ckb.po | ||
4976 | 67 | #: ../data/apt_check.py:137 | 93 | #: ../data/apt_check.py:137 |
4977 | 68 | msgid "Enable UA Infra: ESM to receive additional future security updates." | 94 | msgid "Enable UA Infra: ESM to receive additional future security updates." |
4978 | 69 | msgstr "" | 95 | msgstr "" |
4979 | @@ -73,19 +99,39 @@ msgid "See https://ubuntu.com/security/esm or run: sudo ua status" | |||
4980 | 73 | msgstr "" | 99 | msgstr "" |
4981 | 74 | 100 | ||
4982 | 75 | #: ../data/apt_check.py:184 | 101 | #: ../data/apt_check.py:184 |
4983 | 102 | ======= | ||
4984 | 103 | #: ../data/apt_check.py:135 | ||
4985 | 104 | msgid "Enable UA Infra: ESM to receive additional future security updates." | ||
4986 | 105 | msgstr "" | ||
4987 | 106 | |||
4988 | 107 | #: ../data/apt_check.py:140 | ||
4989 | 108 | msgid "See https://ubuntu.com/security/esm or run: sudo ua status" | ||
4990 | 109 | msgstr "" | ||
4991 | 110 | |||
4992 | 111 | #: ../data/apt_check.py:182 | ||
4993 | 112 | >>>>>>> po/ckb.po | ||
4994 | 76 | #, python-format | 113 | #, python-format |
4995 | 77 | msgid "Error: Opening the cache (%s)" | 114 | msgid "Error: Opening the cache (%s)" |
4996 | 78 | msgstr "" | 115 | msgstr "" |
4997 | 79 | 116 | ||
4998 | 117 | <<<<<<< po/ckb.po | ||
4999 | 80 | #: ../data/apt_check.py:194 | 118 | #: ../data/apt_check.py:194 |
5000 | 81 | msgid "Error: BrokenCount > 0" | 119 | msgid "Error: BrokenCount > 0" |