Merge lp:~logan/ubuntu/raring/seahorse-sharing/3.7.5-0ubuntu1 into lp:ubuntu/raring/seahorse-sharing
- Raring (13.04)
- 3.7.5-0ubuntu1
- Merge into raring
Proposed by
Logan Rosen
Status: | Merged |
---|---|
Merged at revision: | 4 |
Proposed branch: | lp:~logan/ubuntu/raring/seahorse-sharing/3.7.5-0ubuntu1 |
Merge into: | lp:ubuntu/raring/seahorse-sharing |
Diff against target: |
409 lines (+273/-12) 8 files modified
NEWS (+5/-0) configure (+10/-10) configure.ac (+1/-1) debian/changelog (+7/-0) debian/control (+1/-1) po/LINGUAS (+2/-0) po/pt_BR.po (+124/-0) po/ru.po (+123/-0) |
To merge this branch: | bzr merge lp:~logan/ubuntu/raring/seahorse-sharing/3.7.5-0ubuntu1 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel Holbach (community) | Approve | ||
Review via email:
|
Commit message
Description of the change
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'NEWS' |
2 | --- NEWS 2012-12-05 16:06:12 +0000 |
3 | +++ NEWS 2013-02-07 17:38:25 +0000 |
4 | @@ -1,3 +1,8 @@ |
5 | +seahorse-sharing 3.7.5 |
6 | +---------------------- |
7 | + |
8 | + * Updated translations |
9 | + |
10 | seahorse-sharing 3.6.1 |
11 | ---------------------- |
12 | |
13 | |
14 | === modified file 'configure' |
15 | --- configure 2012-12-05 16:06:12 +0000 |
16 | +++ configure 2013-02-07 17:38:25 +0000 |
17 | @@ -1,6 +1,6 @@ |
18 | #! /bin/sh |
19 | # Guess values for system-dependent variables and create Makefiles. |
20 | -# Generated by GNU Autoconf 2.69 for seahorse-sharing 3.6.1. |
21 | +# Generated by GNU Autoconf 2.69 for seahorse-sharing 3.7.5. |
22 | # |
23 | # |
24 | # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. |
25 | @@ -587,8 +587,8 @@ |
26 | # Identity of this package. |
27 | PACKAGE_NAME='seahorse-sharing' |
28 | PACKAGE_TARNAME='seahorse-sharing' |
29 | -PACKAGE_VERSION='3.6.1' |
30 | -PACKAGE_STRING='seahorse-sharing 3.6.1' |
31 | +PACKAGE_VERSION='3.7.5' |
32 | +PACKAGE_STRING='seahorse-sharing 3.7.5' |
33 | PACKAGE_BUGREPORT='' |
34 | PACKAGE_URL='' |
35 | |
36 | @@ -1407,7 +1407,7 @@ |
37 | # Omit some internal or obsolete options to make the list less imposing. |
38 | # This message is too long to be a string in the A/UX 3.1 sh. |
39 | cat <<_ACEOF |
40 | -\`configure' configures seahorse-sharing 3.6.1 to adapt to many kinds of systems. |
41 | +\`configure' configures seahorse-sharing 3.7.5 to adapt to many kinds of systems. |
42 | |
43 | Usage: $0 [OPTION]... [VAR=VALUE]... |
44 | |
45 | @@ -1478,7 +1478,7 @@ |
46 | |
47 | if test -n "$ac_init_help"; then |
48 | case $ac_init_help in |
49 | - short | recursive ) echo "Configuration of seahorse-sharing 3.6.1:";; |
50 | + short | recursive ) echo "Configuration of seahorse-sharing 3.7.5:";; |
51 | esac |
52 | cat <<\_ACEOF |
53 | |
54 | @@ -1616,7 +1616,7 @@ |
55 | test -n "$ac_init_help" && exit $ac_status |
56 | if $ac_init_version; then |
57 | cat <<\_ACEOF |
58 | -seahorse-sharing configure 3.6.1 |
59 | +seahorse-sharing configure 3.7.5 |
60 | generated by GNU Autoconf 2.69 |
61 | |
62 | Copyright (C) 2012 Free Software Foundation, Inc. |
63 | @@ -2102,7 +2102,7 @@ |
64 | This file contains any messages produced by compilers while |
65 | running configure, to aid debugging if configure makes a mistake. |
66 | |
67 | -It was created by seahorse-sharing $as_me 3.6.1, which was |
68 | +It was created by seahorse-sharing $as_me 3.7.5, which was |
69 | generated by GNU Autoconf 2.69. Invocation command line was |
70 | |
71 | $ $0 $@ |
72 | @@ -2930,7 +2930,7 @@ |
73 | # Define the identity of the package. |
74 | |
75 | PACKAGE=seahorse-sharing |
76 | - VERSION=3.6.1 |
77 | + VERSION=3.7.5 |
78 | |
79 | |
80 | cat >>confdefs.h <<_ACEOF |
81 | @@ -18287,7 +18287,7 @@ |
82 | # report actual input values of CONFIG_FILES etc. instead of their |
83 | # values after options handling. |
84 | ac_log=" |
85 | -This file was extended by seahorse-sharing $as_me 3.6.1, which was |
86 | +This file was extended by seahorse-sharing $as_me 3.7.5, which was |
87 | generated by GNU Autoconf 2.69. Invocation command line was |
88 | |
89 | CONFIG_FILES = $CONFIG_FILES |
90 | @@ -18353,7 +18353,7 @@ |
91 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
92 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
93 | ac_cs_version="\\ |
94 | -seahorse-sharing config.status 3.6.1 |
95 | +seahorse-sharing config.status 3.7.5 |
96 | configured by $0, generated by GNU Autoconf 2.69, |
97 | with options \\"\$ac_cs_config\\" |
98 | |
99 | |
100 | === modified file 'configure.ac' |
101 | --- configure.ac 2012-12-05 16:06:12 +0000 |
102 | +++ configure.ac 2013-02-07 17:38:25 +0000 |
103 | @@ -5,7 +5,7 @@ |
104 | dnl **************************************************************************** |
105 | dnl MAIN SEAHORSE VERSION (update after release) |
106 | |
107 | -AC_INIT(seahorse-sharing, 3.6.1) |
108 | +AC_INIT(seahorse-sharing, 3.7.5) |
109 | |
110 | dnl **************************************************************************** |
111 | |
112 | |
113 | === modified file 'debian/changelog' |
114 | --- debian/changelog 2012-12-06 12:04:06 +0000 |
115 | +++ debian/changelog 2013-02-07 17:38:25 +0000 |
116 | @@ -1,3 +1,10 @@ |
117 | +seahorse-sharing (3.7.5-0ubuntu1) raring; urgency=low |
118 | + |
119 | + * New upstream release. |
120 | + * debian/control: Bump Standards-Version to 3.9.4. |
121 | + |
122 | + -- Logan Rosen <logatronico@gmail.com> Thu, 07 Feb 2013 12:10:53 -0500 |
123 | + |
124 | seahorse-sharing (3.6.1-0ubuntu2) raring; urgency=low |
125 | |
126 | * debian/control: build-depends on intltool for translations |
127 | |
128 | === modified file 'debian/control' |
129 | --- debian/control 2012-12-06 12:04:06 +0000 |
130 | +++ debian/control 2013-02-07 17:38:25 +0000 |
131 | @@ -11,7 +11,7 @@ |
132 | libgpgme11-dev, |
133 | libsoup2.4-dev, |
134 | intltool, |
135 | -Standards-Version: 3.9.3 |
136 | +Standards-Version: 3.9.4 |
137 | Homepage: http://live.gnome.org/Seahorse |
138 | |
139 | Package: seahorse-sharing |
140 | |
141 | === modified file 'po/LINGUAS' |
142 | --- po/LINGUAS 2012-12-05 16:06:12 +0000 |
143 | +++ po/LINGUAS 2013-02-07 17:38:25 +0000 |
144 | @@ -4,6 +4,8 @@ |
145 | gl |
146 | lv |
147 | pl |
148 | +pt_BR |
149 | +ru |
150 | sl |
151 | sr |
152 | sr@latin |
153 | |
154 | === added file 'po/pt_BR.po' |
155 | --- po/pt_BR.po 1970-01-01 00:00:00 +0000 |
156 | +++ po/pt_BR.po 2013-02-07 17:38:25 +0000 |
157 | @@ -0,0 +1,124 @@ |
158 | +# Brazilian Portuguese translation for seahorse-sharing. |
159 | +# Copyright (C) 2012 seahorse-sharing's COPYRIGHT HOLDER |
160 | +# This file is distributed under the same license as the seahorse-sharing package. |
161 | +# Rafael Ferreira <rafael.f.f1@gmail.com>, 2012. |
162 | +# |
163 | +msgid "" |
164 | +msgstr "" |
165 | +"Project-Id-Version: seahorse-sharing gnome-3-4\n" |
166 | +"Report-Msgid-Bugs-To: \n" |
167 | +"POT-Creation-Date: 2012-12-05 08:48+0000\n" |
168 | +"PO-Revision-Date: 2012-12-27 04:34-0300\n" |
169 | +"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n" |
170 | +"Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n" |
171 | +"Language: pt_BR\n" |
172 | +"MIME-Version: 1.0\n" |
173 | +"Content-Type: text/plain; charset=UTF-8\n" |
174 | +"Content-Transfer-Encoding: 8bit\n" |
175 | +"Plural-Forms: nplurals=2; plural=(n > 1);\n" |
176 | + |
177 | +#: ../daemon/seahorse-daemon.c:55 |
178 | +msgid "Do not run seahorse-daemon as a daemon" |
179 | +msgstr "Não executar seahorse-daemon como um daemon" |
180 | + |
181 | +#: ../daemon/seahorse-daemon.c:84 |
182 | +msgid "couldn't fork process" |
183 | +msgstr "não foi possível fazer fork do processo" |
184 | + |
185 | +#: ../daemon/seahorse-daemon.c:90 |
186 | +msgid "couldn't create new process group" |
187 | +msgstr "não foi possível criar um novo grupo de processos" |
188 | + |
189 | +#: ../daemon/seahorse-daemon.c:319 |
190 | +msgid "Key Sharing Daemon (Seahorse)" |
191 | +msgstr "Daemon de compartilhamento de chaves (Seahorse)" |
192 | + |
193 | +#: ../daemon/seahorse-sharing.c:167 ../daemon/seahorse-sharing.c:383 |
194 | +msgid "Couldn't share keys" |
195 | +msgstr "Não foi possível compartilhar chaves" |
196 | + |
197 | +#: ../daemon/seahorse-sharing.c:168 |
198 | +msgid "Can't publish discovery information on the network." |
199 | +msgstr "Não é possível publicar informação de descoberta na rede." |
200 | + |
201 | +#. |
202 | +#. * Translators: The %s will get filled in with the user name |
203 | +#. * of the user, to form a genitive. If this is difficult to |
204 | +#. * translate correctly so that it will work correctly in your |
205 | +#. * language, you may use something equivalent to |
206 | +#. * "Shared keys of %s". |
207 | +#. |
208 | +#: ../daemon/seahorse-sharing.c:196 |
209 | +#, c-format |
210 | +msgid "%s's encryption keys" |
211 | +msgstr "Chaves de criptografia do %s" |
212 | + |
213 | +#: ../daemon/seahorse-sharing.desktop.in.h:1 |
214 | +msgid "Seahorse Sharing Daemon" |
215 | +msgstr "Daemon de compartilhamento do Seahorse" |
216 | + |
217 | +#: ../libegg/eggdesktopfile.c:165 |
218 | +#, c-format |
219 | +msgid "File is not a valid .desktop file" |
220 | +msgstr "O arquivo não é um arquivo .desktop válido" |
221 | + |
222 | +#: ../libegg/eggdesktopfile.c:188 |
223 | +#, c-format |
224 | +msgid "Unrecognized desktop file Version '%s'" |
225 | +msgstr "Versão \"%s\" do arquivo desktop desconhecida" |
226 | + |
227 | +#: ../libegg/eggdesktopfile.c:968 |
228 | +#, c-format |
229 | +msgid "Starting %s" |
230 | +msgstr "Iniciando %s" |
231 | + |
232 | +#: ../libegg/eggdesktopfile.c:1110 |
233 | +#, c-format |
234 | +msgid "Application does not accept documents on command line" |
235 | +msgstr "O aplicativo não aceita documentos na linha de comando" |
236 | + |
237 | +#: ../libegg/eggdesktopfile.c:1178 |
238 | +#, c-format |
239 | +msgid "Unrecognized launch option: %d" |
240 | +msgstr "Opção de inicialização desconhecida: %d" |
241 | + |
242 | +# Nessa situação, não se trata de eventual falha, e sim o programa não aceita URI de docs. |
243 | +#: ../libegg/eggdesktopfile.c:1383 |
244 | +#, c-format |
245 | +msgid "Can't pass document URIs to a 'Type=Link' desktop entry" |
246 | +msgstr "" |
247 | +"Não é possível passar URIs de documentos para um registro desktop \"Tipo=link" |
248 | +"\"" |
249 | + |
250 | +#: ../libegg/eggdesktopfile.c:1404 |
251 | +#, c-format |
252 | +msgid "Not a launchable item" |
253 | +msgstr "Item não inicializável" |
254 | + |
255 | +#: ../libegg/eggsmclient.c:225 |
256 | +msgid "Disable connection to session manager" |
257 | +msgstr "Desabilitar conexão com o gerenciador de sessão" |
258 | + |
259 | +#: ../libegg/eggsmclient.c:228 |
260 | +msgid "Specify file containing saved configuration" |
261 | +msgstr "Especificar um arquivo contendo configurações salvas" |
262 | + |
263 | +#: ../libegg/eggsmclient.c:228 |
264 | +msgid "FILE" |
265 | +msgstr "ARQUIVO" |
266 | + |
267 | +#: ../libegg/eggsmclient.c:231 |
268 | +msgid "Specify session management ID" |
269 | +msgstr "Especificar o ID de gerenciamento de sessão" |
270 | + |
271 | +#: ../libegg/eggsmclient.c:231 |
272 | +msgid "ID" |
273 | +msgstr "ID" |
274 | + |
275 | +#: ../libegg/eggsmclient.c:252 |
276 | +msgid "Session management options:" |
277 | +msgstr "Opções de gerenciamento de sessão:" |
278 | + |
279 | +#: ../libegg/eggsmclient.c:253 |
280 | +msgid "Show session management options" |
281 | +msgstr "Mostra as opções de gerenciamento de sessão" |
282 | |
283 | === added file 'po/ru.po' |
284 | --- po/ru.po 1970-01-01 00:00:00 +0000 |
285 | +++ po/ru.po 2013-02-07 17:38:25 +0000 |
286 | @@ -0,0 +1,123 @@ |
287 | +# Russian translation for seahorse-sharing. |
288 | +# Copyright (C) 2012 seahorse-sharing's COPYRIGHT HOLDER |
289 | +# This file is distributed under the same license as the seahorse-sharing package. |
290 | +# Yuri Myasoedov <omerta13@yandex.ru>, 2012. |
291 | +# |
292 | +msgid "" |
293 | +msgstr "" |
294 | +"Project-Id-Version: seahorse-sharing master\n" |
295 | +"Report-Msgid-Bugs-To: \n" |
296 | +"POT-Creation-Date: 2012-11-12 07:57+0000\n" |
297 | +"PO-Revision-Date: 2012-12-22 12:18+0300\n" |
298 | +"Last-Translator: Yuri Myasoedov <omerta13@yandex.ru>\n" |
299 | +"Language-Team: Russian <gnome-cyr@gnome.org>\n" |
300 | +"Language: ru\n" |
301 | +"MIME-Version: 1.0\n" |
302 | +"Content-Type: text/plain; charset=UTF-8\n" |
303 | +"Content-Transfer-Encoding: 8bit\n" |
304 | +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" |
305 | + |
306 | +#: ../daemon/seahorse-daemon.c:55 |
307 | +msgid "Do not run seahorse-daemon as a daemon" |
308 | +msgstr "Не запускать seahorse-daemon в качестве службы" |
309 | + |
310 | +#: ../daemon/seahorse-daemon.c:84 |
311 | +msgid "couldn't fork process" |
312 | +msgstr "не удалось создать новый процесс" |
313 | + |
314 | +#: ../daemon/seahorse-daemon.c:90 |
315 | +msgid "couldn't create new process group" |
316 | +msgstr "не удалось создать новую группу процессов" |
317 | + |
318 | +#: ../daemon/seahorse-daemon.c:319 |
319 | +msgid "Key Sharing Daemon (Seahorse)" |
320 | +msgstr "Служба доступа к ключам (Seahorse)" |
321 | + |
322 | +#: ../daemon/seahorse-sharing.c:167 |
323 | +#: ../daemon/seahorse-sharing.c:383 |
324 | +msgid "Couldn't share keys" |
325 | +msgstr "Не удалось открыть доступ к ключам" |
326 | + |
327 | +#: ../daemon/seahorse-sharing.c:168 |
328 | +msgid "Can't publish discovery information on the network." |
329 | +msgstr "Не удалось опубликовать информацию в сети." |
330 | + |
331 | +#. |
332 | +#. * Translators: The %s will get filled in with the user name |
333 | +#. * of the user, to form a genitive. If this is difficult to |
334 | +#. * translate correctly so that it will work correctly in your |
335 | +#. * language, you may use something equivalent to |
336 | +#. * "Shared keys of %s". |
337 | +#. |
338 | +#: ../daemon/seahorse-sharing.c:196 |
339 | +#, c-format |
340 | +msgid "%s's encryption keys" |
341 | +msgstr "Ключи шифрования пользователя %s" |
342 | + |
343 | +#: ../daemon/seahorse-sharing.desktop.in.h:1 |
344 | +msgid "Seahorse Sharing Daemon" |
345 | +msgstr "Служба доступа к ключам Seahorse" |
346 | + |
347 | +#: ../libegg/eggdesktopfile.c:165 |
348 | +#, c-format |
349 | +msgid "File is not a valid .desktop file" |
350 | +msgstr "Файл не является корректным файлом .desktop" |
351 | + |
352 | +#: ../libegg/eggdesktopfile.c:188 |
353 | +#, c-format |
354 | +msgid "Unrecognized desktop file Version '%s'" |
355 | +msgstr "Неизвестная версия файла .desktop «%s»" |
356 | + |
357 | +#: ../libegg/eggdesktopfile.c:968 |
358 | +#, c-format |
359 | +msgid "Starting %s" |
360 | +msgstr "Запуск %s" |
361 | + |
362 | +#: ../libegg/eggdesktopfile.c:1110 |
363 | +#, c-format |
364 | +msgid "Application does not accept documents on command line" |
365 | +msgstr "Приложение не поддерживает открытие документов через командную строку" |
366 | + |
367 | +#: ../libegg/eggdesktopfile.c:1178 |
368 | +#, c-format |
369 | +msgid "Unrecognized launch option: %d" |
370 | +msgstr "Неизвестный параметр запуска: %d" |
371 | + |
372 | +#: ../libegg/eggdesktopfile.c:1383 |
373 | +#, c-format |
374 | +msgid "Can't pass document URIs to a 'Type=Link' desktop entry" |
375 | +msgstr "Невозможно передать URI в запись «Type=Link» файла .desktop" |
376 | + |
377 | +#: ../libegg/eggdesktopfile.c:1404 |
378 | +#, c-format |
379 | +msgid "Not a launchable item" |
380 | +msgstr "Не может быть запущено" |
381 | + |
382 | +#: ../libegg/eggsmclient.c:225 |
383 | +msgid "Disable connection to session manager" |
384 | +msgstr "Отключить от диспетчера сеансов" |
385 | + |
386 | +#: ../libegg/eggsmclient.c:228 |
387 | +msgid "Specify file containing saved configuration" |
388 | +msgstr "Указать файл с настройками" |
389 | + |
390 | +#: ../libegg/eggsmclient.c:228 |
391 | +msgid "FILE" |
392 | +msgstr "ФАЙЛ" |
393 | + |
394 | +#: ../libegg/eggsmclient.c:231 |
395 | +msgid "Specify session management ID" |
396 | +msgstr "Укажите ID диспетчера сеанса" |
397 | + |
398 | +#: ../libegg/eggsmclient.c:231 |
399 | +msgid "ID" |
400 | +msgstr "ID" |
401 | + |
402 | +#: ../libegg/eggsmclient.c:252 |
403 | +msgid "Session management options:" |
404 | +msgstr "Параметры управления сеансом:" |
405 | + |
406 | +#: ../libegg/eggsmclient.c:253 |
407 | +msgid "Show session management options" |
408 | +msgstr "Показать параметры управления сеансом" |
409 | + |
Thanks. Uploaded.