Merge lp:~logan/ubuntu/raring/seahorse-sharing/3.7.5-0ubuntu1 into lp:ubuntu/raring/seahorse-sharing

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
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Review via email: mp+147191@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Thanks. Uploaded.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'NEWS'
--- NEWS 2012-12-05 16:06:12 +0000
+++ NEWS 2013-02-07 17:38:25 +0000
@@ -1,3 +1,8 @@
1seahorse-sharing 3.7.5
2----------------------
3
4 * Updated translations
5
1seahorse-sharing 3.6.16seahorse-sharing 3.6.1
2----------------------7----------------------
38
49
=== modified file 'configure'
--- configure 2012-12-05 16:06:12 +0000
+++ configure 2013-02-07 17:38:25 +0000
@@ -1,6 +1,6 @@
1#! /bin/sh1#! /bin/sh
2# Guess values for system-dependent variables and create Makefiles.2# Guess values for system-dependent variables and create Makefiles.
3# Generated by GNU Autoconf 2.69 for seahorse-sharing 3.6.1.3# Generated by GNU Autoconf 2.69 for seahorse-sharing 3.7.5.
4#4#
5#5#
6# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.6# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@
587# Identity of this package.587# Identity of this package.
588PACKAGE_NAME='seahorse-sharing'588PACKAGE_NAME='seahorse-sharing'
589PACKAGE_TARNAME='seahorse-sharing'589PACKAGE_TARNAME='seahorse-sharing'
590PACKAGE_VERSION='3.6.1'590PACKAGE_VERSION='3.7.5'
591PACKAGE_STRING='seahorse-sharing 3.6.1'591PACKAGE_STRING='seahorse-sharing 3.7.5'
592PACKAGE_BUGREPORT=''592PACKAGE_BUGREPORT=''
593PACKAGE_URL=''593PACKAGE_URL=''
594594
@@ -1407,7 +1407,7 @@
1407 # Omit some internal or obsolete options to make the list less imposing.1407 # Omit some internal or obsolete options to make the list less imposing.
1408 # This message is too long to be a string in the A/UX 3.1 sh.1408 # This message is too long to be a string in the A/UX 3.1 sh.
1409 cat <<_ACEOF1409 cat <<_ACEOF
1410\`configure' configures seahorse-sharing 3.6.1 to adapt to many kinds of systems.1410\`configure' configures seahorse-sharing 3.7.5 to adapt to many kinds of systems.
14111411
1412Usage: $0 [OPTION]... [VAR=VALUE]...1412Usage: $0 [OPTION]... [VAR=VALUE]...
14131413
@@ -1478,7 +1478,7 @@
14781478
1479if test -n "$ac_init_help"; then1479if test -n "$ac_init_help"; then
1480 case $ac_init_help in1480 case $ac_init_help in
1481 short | recursive ) echo "Configuration of seahorse-sharing 3.6.1:";;1481 short | recursive ) echo "Configuration of seahorse-sharing 3.7.5:";;
1482 esac1482 esac
1483 cat <<\_ACEOF1483 cat <<\_ACEOF
14841484
@@ -1616,7 +1616,7 @@
1616test -n "$ac_init_help" && exit $ac_status1616test -n "$ac_init_help" && exit $ac_status
1617if $ac_init_version; then1617if $ac_init_version; then
1618 cat <<\_ACEOF1618 cat <<\_ACEOF
1619seahorse-sharing configure 3.6.11619seahorse-sharing configure 3.7.5
1620generated by GNU Autoconf 2.691620generated by GNU Autoconf 2.69
16211621
1622Copyright (C) 2012 Free Software Foundation, Inc.1622Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2102,7 +2102,7 @@
2102This file contains any messages produced by compilers while2102This file contains any messages produced by compilers while
2103running configure, to aid debugging if configure makes a mistake.2103running configure, to aid debugging if configure makes a mistake.
21042104
2105It was created by seahorse-sharing $as_me 3.6.1, which was2105It was created by seahorse-sharing $as_me 3.7.5, which was
2106generated by GNU Autoconf 2.69. Invocation command line was2106generated by GNU Autoconf 2.69. Invocation command line was
21072107
2108 $ $0 $@2108 $ $0 $@
@@ -2930,7 +2930,7 @@
2930# Define the identity of the package.2930# Define the identity of the package.
29312931
2932 PACKAGE=seahorse-sharing2932 PACKAGE=seahorse-sharing
2933 VERSION=3.6.12933 VERSION=3.7.5
29342934
29352935
2936cat >>confdefs.h <<_ACEOF2936cat >>confdefs.h <<_ACEOF
@@ -18287,7 +18287,7 @@
18287# report actual input values of CONFIG_FILES etc. instead of their18287# report actual input values of CONFIG_FILES etc. instead of their
18288# values after options handling.18288# values after options handling.
18289ac_log="18289ac_log="
18290This file was extended by seahorse-sharing $as_me 3.6.1, which was18290This file was extended by seahorse-sharing $as_me 3.7.5, which was
18291generated by GNU Autoconf 2.69. Invocation command line was18291generated by GNU Autoconf 2.69. Invocation command line was
1829218292
18293 CONFIG_FILES = $CONFIG_FILES18293 CONFIG_FILES = $CONFIG_FILES
@@ -18353,7 +18353,7 @@
18353cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=118353cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
18354ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"18354ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
18355ac_cs_version="\\18355ac_cs_version="\\
18356seahorse-sharing config.status 3.6.118356seahorse-sharing config.status 3.7.5
18357configured by $0, generated by GNU Autoconf 2.69,18357configured by $0, generated by GNU Autoconf 2.69,
18358 with options \\"\$ac_cs_config\\"18358 with options \\"\$ac_cs_config\\"
1835918359
1836018360
=== modified file 'configure.ac'
--- configure.ac 2012-12-05 16:06:12 +0000
+++ configure.ac 2013-02-07 17:38:25 +0000
@@ -5,7 +5,7 @@
5dnl ****************************************************************************5dnl ****************************************************************************
6dnl MAIN SEAHORSE VERSION (update after release)6dnl MAIN SEAHORSE VERSION (update after release)
77
8AC_INIT(seahorse-sharing, 3.6.1)8AC_INIT(seahorse-sharing, 3.7.5)
99
10dnl ****************************************************************************10dnl ****************************************************************************
1111
1212
=== modified file 'debian/changelog'
--- debian/changelog 2012-12-06 12:04:06 +0000
+++ debian/changelog 2013-02-07 17:38:25 +0000
@@ -1,3 +1,10 @@
1seahorse-sharing (3.7.5-0ubuntu1) raring; urgency=low
2
3 * New upstream release.
4 * debian/control: Bump Standards-Version to 3.9.4.
5
6 -- Logan Rosen <logatronico@gmail.com> Thu, 07 Feb 2013 12:10:53 -0500
7
1seahorse-sharing (3.6.1-0ubuntu2) raring; urgency=low8seahorse-sharing (3.6.1-0ubuntu2) raring; urgency=low
29
3 * debian/control: build-depends on intltool for translations10 * debian/control: build-depends on intltool for translations
411
=== modified file 'debian/control'
--- debian/control 2012-12-06 12:04:06 +0000
+++ debian/control 2013-02-07 17:38:25 +0000
@@ -11,7 +11,7 @@
11 libgpgme11-dev,11 libgpgme11-dev,
12 libsoup2.4-dev,12 libsoup2.4-dev,
13 intltool,13 intltool,
14Standards-Version: 3.9.314Standards-Version: 3.9.4
15Homepage: http://live.gnome.org/Seahorse15Homepage: http://live.gnome.org/Seahorse
1616
17Package: seahorse-sharing17Package: seahorse-sharing
1818
=== modified file 'po/LINGUAS'
--- po/LINGUAS 2012-12-05 16:06:12 +0000
+++ po/LINGUAS 2013-02-07 17:38:25 +0000
@@ -4,6 +4,8 @@
4gl4gl
5lv5lv
6pl6pl
7pt_BR
8ru
7sl9sl
8sr10sr
9sr@latin11sr@latin
1012
=== added file 'po/pt_BR.po'
--- po/pt_BR.po 1970-01-01 00:00:00 +0000
+++ po/pt_BR.po 2013-02-07 17:38:25 +0000
@@ -0,0 +1,124 @@
1# Brazilian Portuguese translation for seahorse-sharing.
2# Copyright (C) 2012 seahorse-sharing's COPYRIGHT HOLDER
3# This file is distributed under the same license as the seahorse-sharing package.
4# Rafael Ferreira <rafael.f.f1@gmail.com>, 2012.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: seahorse-sharing gnome-3-4\n"
9"Report-Msgid-Bugs-To: \n"
10"POT-Creation-Date: 2012-12-05 08:48+0000\n"
11"PO-Revision-Date: 2012-12-27 04:34-0300\n"
12"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
13"Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
14"Language: pt_BR\n"
15"MIME-Version: 1.0\n"
16"Content-Type: text/plain; charset=UTF-8\n"
17"Content-Transfer-Encoding: 8bit\n"
18"Plural-Forms: nplurals=2; plural=(n > 1);\n"
19
20#: ../daemon/seahorse-daemon.c:55
21msgid "Do not run seahorse-daemon as a daemon"
22msgstr "Não executar seahorse-daemon como um daemon"
23
24#: ../daemon/seahorse-daemon.c:84
25msgid "couldn't fork process"
26msgstr "não foi possível fazer fork do processo"
27
28#: ../daemon/seahorse-daemon.c:90
29msgid "couldn't create new process group"
30msgstr "não foi possível criar um novo grupo de processos"
31
32#: ../daemon/seahorse-daemon.c:319
33msgid "Key Sharing Daemon (Seahorse)"
34msgstr "Daemon de compartilhamento de chaves (Seahorse)"
35
36#: ../daemon/seahorse-sharing.c:167 ../daemon/seahorse-sharing.c:383
37msgid "Couldn't share keys"
38msgstr "Não foi possível compartilhar chaves"
39
40#: ../daemon/seahorse-sharing.c:168
41msgid "Can't publish discovery information on the network."
42msgstr "Não é possível publicar informação de descoberta na rede."
43
44#.
45#. * Translators: The %s will get filled in with the user name
46#. * of the user, to form a genitive. If this is difficult to
47#. * translate correctly so that it will work correctly in your
48#. * language, you may use something equivalent to
49#. * "Shared keys of %s".
50#.
51#: ../daemon/seahorse-sharing.c:196
52#, c-format
53msgid "%s's encryption keys"
54msgstr "Chaves de criptografia do %s"
55
56#: ../daemon/seahorse-sharing.desktop.in.h:1
57msgid "Seahorse Sharing Daemon"
58msgstr "Daemon de compartilhamento do Seahorse"
59
60#: ../libegg/eggdesktopfile.c:165
61#, c-format
62msgid "File is not a valid .desktop file"
63msgstr "O arquivo não é um arquivo .desktop válido"
64
65#: ../libegg/eggdesktopfile.c:188
66#, c-format
67msgid "Unrecognized desktop file Version '%s'"
68msgstr "Versão \"%s\" do arquivo desktop desconhecida"
69
70#: ../libegg/eggdesktopfile.c:968
71#, c-format
72msgid "Starting %s"
73msgstr "Iniciando %s"
74
75#: ../libegg/eggdesktopfile.c:1110
76#, c-format
77msgid "Application does not accept documents on command line"
78msgstr "O aplicativo não aceita documentos na linha de comando"
79
80#: ../libegg/eggdesktopfile.c:1178
81#, c-format
82msgid "Unrecognized launch option: %d"
83msgstr "Opção de inicialização desconhecida: %d"
84
85# Nessa situação, não se trata de eventual falha, e sim o programa não aceita URI de docs.
86#: ../libegg/eggdesktopfile.c:1383
87#, c-format
88msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
89msgstr ""
90"Não é possível passar URIs de documentos para um registro desktop \"Tipo=link"
91"\""
92
93#: ../libegg/eggdesktopfile.c:1404
94#, c-format
95msgid "Not a launchable item"
96msgstr "Item não inicializável"
97
98#: ../libegg/eggsmclient.c:225
99msgid "Disable connection to session manager"
100msgstr "Desabilitar conexão com o gerenciador de sessão"
101
102#: ../libegg/eggsmclient.c:228
103msgid "Specify file containing saved configuration"
104msgstr "Especificar um arquivo contendo configurações salvas"
105
106#: ../libegg/eggsmclient.c:228
107msgid "FILE"
108msgstr "ARQUIVO"
109
110#: ../libegg/eggsmclient.c:231
111msgid "Specify session management ID"
112msgstr "Especificar o ID de gerenciamento de sessão"
113
114#: ../libegg/eggsmclient.c:231
115msgid "ID"
116msgstr "ID"
117
118#: ../libegg/eggsmclient.c:252
119msgid "Session management options:"
120msgstr "Opções de gerenciamento de sessão:"
121
122#: ../libegg/eggsmclient.c:253
123msgid "Show session management options"
124msgstr "Mostra as opções de gerenciamento de sessão"
0125
=== added file 'po/ru.po'
--- po/ru.po 1970-01-01 00:00:00 +0000
+++ po/ru.po 2013-02-07 17:38:25 +0000
@@ -0,0 +1,123 @@
1# Russian translation for seahorse-sharing.
2# Copyright (C) 2012 seahorse-sharing's COPYRIGHT HOLDER
3# This file is distributed under the same license as the seahorse-sharing package.
4# Yuri Myasoedov <omerta13@yandex.ru>, 2012.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: seahorse-sharing master\n"
9"Report-Msgid-Bugs-To: \n"
10"POT-Creation-Date: 2012-11-12 07:57+0000\n"
11"PO-Revision-Date: 2012-12-22 12:18+0300\n"
12"Last-Translator: Yuri Myasoedov <omerta13@yandex.ru>\n"
13"Language-Team: Russian <gnome-cyr@gnome.org>\n"
14"Language: ru\n"
15"MIME-Version: 1.0\n"
16"Content-Type: text/plain; charset=UTF-8\n"
17"Content-Transfer-Encoding: 8bit\n"
18"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"
19
20#: ../daemon/seahorse-daemon.c:55
21msgid "Do not run seahorse-daemon as a daemon"
22msgstr "Не запускать seahorse-daemon в качестве службы"
23
24#: ../daemon/seahorse-daemon.c:84
25msgid "couldn't fork process"
26msgstr "не удалось создать новый процесс"
27
28#: ../daemon/seahorse-daemon.c:90
29msgid "couldn't create new process group"
30msgstr "не удалось создать новую группу процессов"
31
32#: ../daemon/seahorse-daemon.c:319
33msgid "Key Sharing Daemon (Seahorse)"
34msgstr "Служба доступа к ключам (Seahorse)"
35
36#: ../daemon/seahorse-sharing.c:167
37#: ../daemon/seahorse-sharing.c:383
38msgid "Couldn't share keys"
39msgstr "Не удалось открыть доступ к ключам"
40
41#: ../daemon/seahorse-sharing.c:168
42msgid "Can't publish discovery information on the network."
43msgstr "Не удалось опубликовать информацию в сети."
44
45#.
46#. * Translators: The %s will get filled in with the user name
47#. * of the user, to form a genitive. If this is difficult to
48#. * translate correctly so that it will work correctly in your
49#. * language, you may use something equivalent to
50#. * "Shared keys of %s".
51#.
52#: ../daemon/seahorse-sharing.c:196
53#, c-format
54msgid "%s's encryption keys"
55msgstr "Ключи шифрования пользователя %s"
56
57#: ../daemon/seahorse-sharing.desktop.in.h:1
58msgid "Seahorse Sharing Daemon"
59msgstr "Служба доступа к ключам Seahorse"
60
61#: ../libegg/eggdesktopfile.c:165
62#, c-format
63msgid "File is not a valid .desktop file"
64msgstr "Файл не является корректным файлом .desktop"
65
66#: ../libegg/eggdesktopfile.c:188
67#, c-format
68msgid "Unrecognized desktop file Version '%s'"
69msgstr "Неизвестная версия файла .desktop «%s»"
70
71#: ../libegg/eggdesktopfile.c:968
72#, c-format
73msgid "Starting %s"
74msgstr "Запуск %s"
75
76#: ../libegg/eggdesktopfile.c:1110
77#, c-format
78msgid "Application does not accept documents on command line"
79msgstr "Приложение не поддерживает открытие документов через командную строку"
80
81#: ../libegg/eggdesktopfile.c:1178
82#, c-format
83msgid "Unrecognized launch option: %d"
84msgstr "Неизвестный параметр запуска: %d"
85
86#: ../libegg/eggdesktopfile.c:1383
87#, c-format
88msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
89msgstr "Невозможно передать URI в запись «Type=Link» файла .desktop"
90
91#: ../libegg/eggdesktopfile.c:1404
92#, c-format
93msgid "Not a launchable item"
94msgstr "Не может быть запущено"
95
96#: ../libegg/eggsmclient.c:225
97msgid "Disable connection to session manager"
98msgstr "Отключить от диспетчера сеансов"
99
100#: ../libegg/eggsmclient.c:228
101msgid "Specify file containing saved configuration"
102msgstr "Указать файл с настройками"
103
104#: ../libegg/eggsmclient.c:228
105msgid "FILE"
106msgstr "ФАЙЛ"
107
108#: ../libegg/eggsmclient.c:231
109msgid "Specify session management ID"
110msgstr "Укажите ID диспетчера сеанса"
111
112#: ../libegg/eggsmclient.c:231
113msgid "ID"
114msgstr "ID"
115
116#: ../libegg/eggsmclient.c:252
117msgid "Session management options:"
118msgstr "Параметры управления сеансом:"
119
120#: ../libegg/eggsmclient.c:253
121msgid "Show session management options"
122msgstr "Показать параметры управления сеансом"
123

Subscribers

People subscribed via source and target branches

to all changes: