Déjà Dup

Merge lp:~chogydan/deja-dup/translation-fix into lp:~deja-dup-team/deja-dup/trunk

  1. translation-fix
  2. Merge into trunk
Proposed by Daniel Hollocher
Status: Merged
Merge reported by: Michael Terry
Merged at revision: not available
Proposed branch: lp:~chogydan/deja-dup/translation-fix
Merge into: lp:~deja-dup-team/deja-dup/trunk
Diff against target: 128 lines (+10/-10)
10 files modified
data/deja-dup.schemas.in (+1/-1)
po/ar.po (+1/-1)
po/de.po (+1/-1)
po/deja-dup.pot (+1/-1)
po/fi.po (+1/-1)
po/fr.po (+1/-1)
po/nl.po (+1/-1)
po/ru.po (+1/-1)
po/sk.po (+1/-1)
po/sl.po (+1/-1)
To merge this branch: bzr merge lp:~chogydan/deja-dup/translation-fix
Reviewer Review Type Date Requested Status
Michael Terry Approve
Review via email: mp+19449@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Hollocher (chogydan) wrote :

I just changed all occurrences of retoring to restoring. I found them in several of the .po files. Is this the way to fix that translation bug?

Revision history for this message
Michael Terry (mterry) wrote :

Looks correct. Nice work on fixing the translations too. Merged. Thanks, Daniel!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/deja-dup.schemas.in'
2--- data/deja-dup.schemas.in 2010-01-18 23:31:22 +0000
3+++ data/deja-dup.schemas.in 2010-02-16 22:35:24 +0000
4@@ -35,7 +35,7 @@
5 <default>true</default>
6 <locale name="C">
7 <short>Whether to request the root password</short>
8- <long>Whether to request the root password when backing up from or retoring to system folders.</long>
9+ <long>Whether to request the root password when backing up from or restoring to system folders.</long>
10 </locale>
11 </schema>
12
13
14=== modified file 'po/ar.po'
15--- po/ar.po 2010-01-24 02:38:46 +0000
16+++ po/ar.po 2010-02-16 22:35:24 +0000
17@@ -165,7 +165,7 @@
18
19 #: ../data/deja-dup.schemas.in.h:24
20 msgid ""
21-"Whether to request the root password when backing up from or retoring to "
22+"Whether to request the root password when backing up from or restoring to "
23 "system folders."
24 msgstr ""
25
26
27=== modified file 'po/de.po'
28--- po/de.po 2010-01-24 02:38:46 +0000
29+++ po/de.po 2010-02-16 22:35:24 +0000
30@@ -177,7 +177,7 @@
31
32 #: ../data/deja-dup.schemas.in.h:24
33 msgid ""
34-"Whether to request the root password when backing up from or retoring to "
35+"Whether to request the root password when backing up from or restoring to "
36 "system folders."
37 msgstr ""
38
39
40=== modified file 'po/deja-dup.pot'
41--- po/deja-dup.pot 2010-02-08 21:46:44 +0000
42+++ po/deja-dup.pot 2010-02-16 22:35:24 +0000
43@@ -163,7 +163,7 @@
44
45 #: ../data/deja-dup.schemas.in.h:24
46 msgid ""
47-"Whether to request the root password when backing up from or retoring to "
48+"Whether to request the root password when backing up from or restoring to "
49 "system folders."
50 msgstr ""
51
52
53=== modified file 'po/fi.po'
54--- po/fi.po 2010-02-08 21:57:46 +0000
55+++ po/fi.po 2010-02-16 22:35:24 +0000
56@@ -184,7 +184,7 @@
57
58 #: ../data/deja-dup.schemas.in.h:24
59 msgid ""
60-"Whether to request the root password when backing up from or retoring to "
61+"Whether to request the root password when backing up from or restoring to "
62 "system folders."
63 msgstr ""
64
65
66=== modified file 'po/fr.po'
67--- po/fr.po 2010-01-24 02:38:46 +0000
68+++ po/fr.po 2010-02-16 22:35:24 +0000
69@@ -173,7 +173,7 @@
70
71 #: ../data/deja-dup.schemas.in.h:24
72 msgid ""
73-"Whether to request the root password when backing up from or retoring to "
74+"Whether to request the root password when backing up from or restoring to "
75 "system folders."
76 msgstr ""
77
78
79=== modified file 'po/nl.po'
80--- po/nl.po 2010-02-08 21:57:46 +0000
81+++ po/nl.po 2010-02-16 22:35:24 +0000
82@@ -170,7 +170,7 @@
83
84 #: ../data/deja-dup.schemas.in.h:24
85 msgid ""
86-"Whether to request the root password when backing up from or retoring to "
87+"Whether to request the root password when backing up from or restoring to "
88 "system folders."
89 msgstr ""
90
91
92=== modified file 'po/ru.po'
93--- po/ru.po 2010-02-08 21:57:46 +0000
94+++ po/ru.po 2010-02-16 22:35:24 +0000
95@@ -185,7 +185,7 @@
96
97 #: ../data/deja-dup.schemas.in.h:24
98 msgid ""
99-"Whether to request the root password when backing up from or retoring to "
100+"Whether to request the root password when backing up from or restoring to "
101 "system folders."
102 msgstr ""
103
104
105=== modified file 'po/sk.po'
106--- po/sk.po 2010-01-24 02:38:46 +0000
107+++ po/sk.po 2010-02-16 22:35:24 +0000
108@@ -179,7 +179,7 @@
109
110 #: ../data/deja-dup.schemas.in.h:24
111 msgid ""
112-"Whether to request the root password when backing up from or retoring to "
113+"Whether to request the root password when backing up from or restoring to "
114 "system folders."
115 msgstr ""
116
117
118=== modified file 'po/sl.po'
119--- po/sl.po 2010-02-08 21:57:46 +0000
120+++ po/sl.po 2010-02-16 22:35:24 +0000
121@@ -167,7 +167,7 @@
122
123 #: ../data/deja-dup.schemas.in.h:24
124 msgid ""
125-"Whether to request the root password when backing up from or retoring to "
126+"Whether to request the root password when backing up from or restoring to "
127 "system folders."
128 msgstr ""
129

Subscribers

People subscribed via source and target branches