Ubuntu Help App

Merge lp:~dholbach/help-app/passworde-typo-fix into lp:~ubuntu-touch-coreapps-drivers/help-app/trunk

  1. passworde-typo-fix
  2. Merge into trunk
Proposed by Daniel Holbach on 2015-03-19
Status: Merged
Approved by: David Planella on 2015-03-19
Approved revision: 114
Merged at revision: 111
Proposed branch: lp:~dholbach/help-app/passworde-typo-fix
Merge into: lp:~ubuntu-touch-coreapps-drivers/help-app/trunk
Diff against target: 1991 lines (+403/-383)
9 files modified
edit-here/content/pages/faq.md (+0/-1)
edit-here/content/pages/security.md (+1/-1)
edit-here/po/de.po (+68/-63)
edit-here/po/es.po (+67/-62)
edit-here/po/fr.po (+65/-60)
edit-here/po/help.pot (+4/-10)
edit-here/po/it.po (+65/-60)
edit-here/po/pt.po (+68/-66)
edit-here/po/ro.po (+65/-60)
To merge this branch: bzr merge lp:~dholbach/help-app/passworde-typo-fix
Reviewer Review Type Date Requested Status
David Planella 2015-03-19 Approve on 2015-03-19
Review via email: mp+253468@code.launchpad.net
To post a comment you must log in.
David Planella (dpm) wrote :

Change looks good to me, but while we're at it, I proposed another change.

lp:~dholbach/help-app/passworde-typo-fix updated on 2015-03-19
112. By Daniel Holbach on 2015-03-19

security code vs passcode

113. By Daniel Holbach on 2015-03-19

drop link to store.md - we merged it into apps.md

114. By Daniel Holbach on 2015-03-19

update .pot and .po files

David Planella (dpm) wrote :

LGTM, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'edit-here/content/pages/faq.md'
2--- edit-here/content/pages/faq.md 2015-03-09 15:51:58 +0000
3+++ edit-here/content/pages/faq.md 2015-03-19 08:34:04 +0000
4@@ -6,7 +6,6 @@
5 ### [First day tasks]({filename}basic.md)
6 ### [User Interface]({filename}ui.md)
7 ### [Settings]({filename}settings.md)
8-### [The Store]({filename}store.md)
9 ### [Apps]({filename}apps.md)
10 ### [Scopes]({filename}scopes.md)
11 ### [Security]({filename}security.md)
12
13=== modified file 'edit-here/content/pages/security.md'
14--- edit-here/content/pages/security.md 2015-03-18 08:18:10 +0000
15+++ edit-here/content/pages/security.md 2015-03-19 08:34:04 +0000
16@@ -22,5 +22,5 @@
17 ### How can I stop someone using the indicators when the phone is unlocked? !!T
18 You can find this setting under the *System Settings* application. Select *Security & Privacy*, then *Phone Locking* to adjust the *When locked, allow* settings. Specifically, toggle off the *Notifications and quick settings* option.
19
20-### I forgot my passworde/security code. How can I unlock the phone? !!T
21+### I forgot my password or passcode. How can I unlock the phone? !!T
22 TBD
23
24=== modified file 'edit-here/po/de.po'
25--- edit-here/po/de.po 2015-03-19 06:02:42 +0000
26+++ edit-here/po/de.po 2015-03-19 08:34:04 +0000
27@@ -2,7 +2,7 @@
28 # Copyright (C) YEAR Free Software Foundation, Inc.
29 # This file is distributed under the same license as the PACKAGE package.
30 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
31-#
32+#
33 msgid ""
34 msgstr ""
35 "Project-Id-Version: PACKAGE VERSION\n"
36@@ -11,12 +11,12 @@
37 "PO-Revision-Date: 2015-03-16 15:39+0000\n"
38 "Last-Translator: Daniel Holbach <daniel.holbach@ubuntu.com>\n"
39 "Language-Team: LANGUAGE <LL@li.org>\n"
40+"Language: \n"
41 "MIME-Version: 1.0\n"
42 "Content-Type: text/plain; charset=UTF-8\n"
43 "Content-Transfer-Encoding: 8bit\n"
44+"X-Generator: Launchpad (build 17403)\n"
45 "X-Launchpad-Export-Date: 2015-03-19 06:02+0000\n"
46-"X-Generator: Launchpad (build 17403)\n"
47-"Language: \n"
48
49 #. type: Plain text
50 #: content/pages/security.md:2
51@@ -34,7 +34,7 @@
52 #: content/pages/settings.md:6 content/pages/ui.md:6 content/pages/apps.md:7
53 #: content/pages/scopes.md:6
54 msgid "[TOC]"
55-msgstr ""
56+msgstr "[TOC]"
57
58 #. !!T
59 #: content/pages/security.md:7
60@@ -94,8 +94,8 @@
61 #: content/pages/security.md:19
62 #, no-wrap
63 msgid ""
64-"Why do I have to type my PIN when using File Manager & Terminal (not default "
65-"apps)?"
66+"Why do I have to type my PIN when using File Manager & Terminal (not default"
67+" apps)?"
68 msgstr ""
69
70 #. type: Plain text
71@@ -121,12 +121,6 @@
72 "settings* option."
73 msgstr ""
74
75-#. !!T
76-#: content/pages/security.md:25
77-#, no-wrap
78-msgid "I forgot my passworde/security code. How can I unlock the phone?"
79-msgstr ""
80-
81 #. type: Plain text
82 #: content/pages/security.md:26
83 msgid "TBD"
84@@ -153,9 +147,12 @@
85 #: content/pages/basic.md:9
86 msgid ""
87 "The music app let's you play music copied to the device. In addition, "
88-"[scopes]({filename}scopes.md) such as 7digital and Grooveshark can also play "
89-"music."
90+"[scopes]({filename}scopes.md) such as 7digital and Grooveshark can also play"
91+" music."
92 msgstr ""
93+"The music app let's you play music copied to the device. In addition, "
94+"[scopes]({filename}scopes.de.md) such as 7digital and Grooveshark can also "
95+"play music."
96
97 #. !!T
98 #: content/pages/basic.md:10
99@@ -166,8 +163,8 @@
100 #. type: Plain text
101 #: content/pages/basic.md:12
102 msgid ""
103-"The media player application will play videos copied to the device. You will "
104-"also find applications like youtube that give you streaming options."
105+"The media player application will play videos copied to the device. You will"
106+" also find applications like youtube that give you streaming options."
107 msgstr ""
108
109 #. !!T
110@@ -205,8 +202,8 @@
111 #. type: Plain text
112 #: content/pages/basic.md:21
113 msgid ""
114-"If you've just taken a picture, you can see it easily by swiping to the left "
115-"from the right edge inside the camera app. Alternatively, use the gallery "
116+"If you've just taken a picture, you can see it easily by swiping to the left"
117+" from the right edge inside the camera app. Alternatively, use the gallery "
118 "app to find the picture."
119 msgstr ""
120
121@@ -267,43 +264,37 @@
122 #: content/pages/faq.md:6
123 #, no-wrap
124 msgid "[First day tasks]({filename}basic.md)"
125-msgstr ""
126+msgstr "[First day tasks]({filename}basic.de.md)"
127
128 #. type: Title ###
129 #: content/pages/faq.md:7
130 #, no-wrap
131 msgid "[User Interface]({filename}ui.md)"
132-msgstr ""
133+msgstr "[User Interface]({filename}ui.de.md)"
134
135 #. type: Title ###
136 #: content/pages/faq.md:8
137 #, no-wrap
138 msgid "[Settings]({filename}settings.md)"
139-msgstr ""
140+msgstr "[Settings]({filename}settings.de.md)"
141
142 #. type: Title ###
143 #: content/pages/faq.md:9
144 #, no-wrap
145-msgid "[The Store]({filename}store.md)"
146-msgstr ""
147-
148-#. type: Title ###
149-#: content/pages/faq.md:10
150-#, no-wrap
151 msgid "[Apps]({filename}apps.md)"
152 msgstr "[Apps]({filename}apps.de.md)"
153
154 #. type: Title ###
155+#: content/pages/faq.md:10
156+#, no-wrap
157+msgid "[Scopes]({filename}scopes.md)"
158+msgstr "[Scopes]({filename}scopes.de.md)"
159+
160+#. type: Title ###
161 #: content/pages/faq.md:11
162 #, no-wrap
163-msgid "[Scopes]({filename}scopes.md)"
164-msgstr ""
165-
166-#. type: Title ###
167-#: content/pages/faq.md:12
168-#, no-wrap
169 msgid "[Security]({filename}security.md)"
170-msgstr ""
171+msgstr "[Security]({filename}security.de.md)"
172
173 #. type: Plain text
174 #: content/pages/index.md:2
175@@ -340,6 +331,8 @@
176 "[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
177 "touch.md)"
178 msgstr ""
179+"[Take me to the FAQ!]({filename}faq.de.md) [Get in touch]({filename}get-in-"
180+"touch.md)"
181
182 #. type: Plain text
183 #: content/pages/settings.md:2
184@@ -416,8 +409,8 @@
185 #. type: Plain text
186 #: content/pages/settings.md:22
187 msgid ""
188-"You can set up some of your accounts from the scopes. Today scope allows you "
189-"to configure your Google and Fitbit account, while the Pictures scope lets "
190+"You can set up some of your accounts from the scopes. Today scope allows you"
191+" to configure your Google and Fitbit account, while the Pictures scope lets "
192 "you configure your flickr, Facebook and Instagram account. You can manage "
193 "all your accounts (including social media, email, etc) from the *System "
194 "Settings* app, under *Personal*, *Accounts*."
195@@ -475,8 +468,8 @@
196 #. type: Plain text
197 #: content/pages/ui.md:9
198 msgid ""
199-"The dash contains a list of applications installed on the device, along with "
200-"presenting the scopes and store. The dash is the first thing you see when "
201+"The dash contains a list of applications installed on the device, along with"
202+" presenting the scopes and store. The dash is the first thing you see when "
203 "booting the phone. You can switch to it again at any time by swiping left "
204 "from the right screen edge."
205 msgstr ""
206@@ -503,8 +496,8 @@
207 #. type: Plain text
208 #: content/pages/ui.md:15
209 msgid ""
210-"Indicators convey quick useful information about your device, like the time, "
211-"data connection, location, sound, and notifications. You can access the "
212+"Indicators convey quick useful information about your device, like the time,"
213+" data connection, location, sound, and notifications. You can access the "
214 "indicators at any time by swiping down from the top screen edge."
215 msgstr ""
216
217@@ -533,10 +526,10 @@
218 #. type: Plain text
219 #: content/pages/ui.md:22
220 msgid ""
221-"To close an application, slide your finger *slowly* left from the right edge "
222-"of the screen. An application switcher will appear. Place your finger on the "
223-"application preview you wish to close and swipe up or down. The application "
224-"will disappear."
225+"To close an application, slide your finger *slowly* left from the right edge"
226+" of the screen. An application switcher will appear. Place your finger on "
227+"the application preview you wish to close and swipe up or down. The "
228+"application will disappear."
229 msgstr ""
230
231 #. !!T
232@@ -548,8 +541,8 @@
233 #. type: Plain text
234 #: content/pages/ui.md:25
235 msgid ""
236-"For text that can be copied and pasted, press and hold the text in question. "
237-"A menu will appear allowing you to cut, copy and paste."
238+"For text that can be copied and pasted, press and hold the text in question."
239+" A menu will appear allowing you to cut, copy and paste."
240 msgstr ""
241
242 #. !!T
243@@ -591,8 +584,8 @@
244 #. type: Plain text
245 #: content/pages/ui.md:33
246 msgid ""
247-"The round circle is the infographic. It hows you recent phone activity, like "
248-"the number of messages received or the number of songs played."
249+"The round circle is the infographic. It hows you recent phone activity, like"
250+" the number of messages received or the number of songs played."
251 msgstr ""
252
253 #. type: Plain text
254@@ -630,8 +623,8 @@
255 #: content/pages/apps.md:14
256 msgid ""
257 "From the Apps scope, you can either tap on the “search” icon on the right "
258-"and start searching by name, or you can go all the way down in the scope and "
259-"tap on the Ubuntu Store icon."
260+"and start searching by name, or you can go all the way down in the scope and"
261+" tap on the Ubuntu Store icon."
262 msgstr ""
263
264 #. !!T
265@@ -704,8 +697,8 @@
266 #: content/pages/apps.md:34
267 msgid ""
268 "You can add music in multiple ways. If you have pre-existing music files, "
269-"simply connect your phone to your pc via the usb cable. Next, copy the music "
270-"you wish to listen to to the *Music* folder. Your music will appear in the "
271+"simply connect your phone to your pc via the usb cable. Next, copy the music"
272+" you wish to listen to to the *Music* folder. Your music will appear in the "
273 "music app. Alternatively, you can acquire music directly using the device "
274 "via a scope, such as grooveshark or by downloading via the browser or "
275 "another application."
276@@ -737,11 +730,11 @@
277 #. type: Plain text
278 #: content/pages/apps.md:42
279 msgid ""
280-"The first time you open the Contacts app you’ll be asked if you want to sync "
281-"contacts with your Google account. If you have answered “no” but change your "
282-"mind later, you can do so by going to the Today scope, and setting up your "
283-"Google account there. After that you can sync your contacts (and, if you "
284-"want, calendar events as well)."
285+"The first time you open the Contacts app you’ll be asked if you want to sync"
286+" contacts with your Google account. If you have answered “no” but change "
287+"your mind later, you can do so by going to the Today scope, and setting up "
288+"your Google account there. After that you can sync your contacts (and, if "
289+"you want, calendar events as well)."
290 msgstr ""
291
292 #. type: Title ##
293@@ -776,8 +769,8 @@
294 msgid ""
295 "If you've just taken a video, share it easily by swiping to the left from "
296 "the right edge inside the camera app. Alternatively, use the gallery app to "
297-"find the video. Once loaded, select *Share* from the menu and choose how you "
298-"wish to share your video."
299+"find the video. Once loaded, select *Share* from the menu and choose how you"
300+" wish to share your video."
301 msgstr ""
302
303 #. type: Title ##
304@@ -808,8 +801,8 @@
305 #. type: Plain text
306 #: content/pages/apps.md:60
307 msgid ""
308-"Use the gallery app to select your picture. Select the *Edit* button next to "
309-"the menu. Inside you'll find options to crop and rotate your picture."
310+"Use the gallery app to select your picture. Select the *Edit* button next to"
311+" the menu. Inside you'll find options to crop and rotate your picture."
312 msgstr ""
313
314 #. !!T
315@@ -946,8 +939,8 @@
316 #: content/pages/scopes.md:9
317 msgid ""
318 "Swipe up from the bottom edge of the dash to reveal a scopes manager. "
319-"Favorite scopes you wish to appear on your dash by selecting them. Selecting "
320-"them again will remove the favorite. All favorited scopes will appear on "
321+"Favorite scopes you wish to appear on your dash by selecting them. Selecting"
322+" them again will remove the favorite. All favorited scopes will appear on "
323 "your dash."
324 msgstr ""
325
326@@ -980,3 +973,15 @@
327 "will remove it from your dash. If you'd like to remove it completely, visit "
328 "the scope page in the ubuntu store and select *Uninstall*."
329 msgstr ""
330+
331+#. !!T
332+#: content/pages/security.md:25
333+#, no-wrap
334+msgid "I forgot my password or passcode. How can I unlock the phone?"
335+msgstr ""
336+
337+#~ msgid "[The Store]({filename}store.md)"
338+#~ msgstr ""
339+
340+#~ msgid "I forgot my passworde/security code. How can I unlock the phone?"
341+#~ msgstr ""
342
343=== modified file 'edit-here/po/es.po'
344--- edit-here/po/es.po 2015-03-19 06:02:42 +0000
345+++ edit-here/po/es.po 2015-03-19 08:34:04 +0000
346@@ -2,7 +2,7 @@
347 # Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
348 # This file is distributed under the same license as the ubuntu-devices-help package.
349 # FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
350-#
351+#
352 msgid ""
353 msgstr ""
354 "Project-Id-Version: ubuntu-devices-help\n"
355@@ -14,8 +14,8 @@
356 "MIME-Version: 1.0\n"
357 "Content-Type: text/plain; charset=UTF-8\n"
358 "Content-Transfer-Encoding: 8bit\n"
359+"X-Generator: Launchpad (build 17403)\n"
360 "X-Launchpad-Export-Date: 2015-03-19 06:02+0000\n"
361-"X-Generator: Launchpad (build 17403)\n"
362
363 #. type: Plain text
364 #: content/pages/security.md:2
365@@ -33,7 +33,7 @@
366 #: content/pages/settings.md:6 content/pages/ui.md:6 content/pages/apps.md:7
367 #: content/pages/scopes.md:6
368 msgid "[TOC]"
369-msgstr ""
370+msgstr "[TOC]"
371
372 #. !!T
373 #: content/pages/security.md:7
374@@ -93,8 +93,8 @@
375 #: content/pages/security.md:19
376 #, no-wrap
377 msgid ""
378-"Why do I have to type my PIN when using File Manager & Terminal (not default "
379-"apps)?"
380+"Why do I have to type my PIN when using File Manager & Terminal (not default"
381+" apps)?"
382 msgstr ""
383
384 #. type: Plain text
385@@ -120,12 +120,6 @@
386 "settings* option."
387 msgstr ""
388
389-#. !!T
390-#: content/pages/security.md:25
391-#, no-wrap
392-msgid "I forgot my passworde/security code. How can I unlock the phone?"
393-msgstr ""
394-
395 #. type: Plain text
396 #: content/pages/security.md:26
397 msgid "TBD"
398@@ -152,9 +146,12 @@
399 #: content/pages/basic.md:9
400 msgid ""
401 "The music app let's you play music copied to the device. In addition, "
402-"[scopes]({filename}scopes.md) such as 7digital and Grooveshark can also play "
403-"music."
404+"[scopes]({filename}scopes.md) such as 7digital and Grooveshark can also play"
405+" music."
406 msgstr ""
407+"The music app let's you play music copied to the device. In addition, "
408+"[scopes]({filename}scopes.es.md) such as 7digital and Grooveshark can also "
409+"play music."
410
411 #. !!T
412 #: content/pages/basic.md:10
413@@ -165,8 +162,8 @@
414 #. type: Plain text
415 #: content/pages/basic.md:12
416 msgid ""
417-"The media player application will play videos copied to the device. You will "
418-"also find applications like youtube that give you streaming options."
419+"The media player application will play videos copied to the device. You will"
420+" also find applications like youtube that give you streaming options."
421 msgstr ""
422
423 #. !!T
424@@ -204,8 +201,8 @@
425 #. type: Plain text
426 #: content/pages/basic.md:21
427 msgid ""
428-"If you've just taken a picture, you can see it easily by swiping to the left "
429-"from the right edge inside the camera app. Alternatively, use the gallery "
430+"If you've just taken a picture, you can see it easily by swiping to the left"
431+" from the right edge inside the camera app. Alternatively, use the gallery "
432 "app to find the picture."
433 msgstr ""
434
435@@ -266,43 +263,37 @@
436 #: content/pages/faq.md:6
437 #, no-wrap
438 msgid "[First day tasks]({filename}basic.md)"
439-msgstr ""
440+msgstr "[First day tasks]({filename}basic.es.md)"
441
442 #. type: Title ###
443 #: content/pages/faq.md:7
444 #, no-wrap
445 msgid "[User Interface]({filename}ui.md)"
446-msgstr "[Interfaz de usuario]({filename}ui.md)"
447+msgstr "[Interfaz de usuario]({filename}ui.es.md)"
448
449 #. type: Title ###
450 #: content/pages/faq.md:8
451 #, no-wrap
452 msgid "[Settings]({filename}settings.md)"
453-msgstr "[Configuración]({filename}settings.md)"
454+msgstr "[Configuración]({filename}settings.es.md)"
455
456 #. type: Title ###
457 #: content/pages/faq.md:9
458 #, no-wrap
459-msgid "[The Store]({filename}store.md)"
460-msgstr ""
461+msgid "[Apps]({filename}apps.md)"
462+msgstr "[Aplicaciones]({filename}apps.es.md)"
463
464 #. type: Title ###
465 #: content/pages/faq.md:10
466 #, no-wrap
467-msgid "[Apps]({filename}apps.md)"
468-msgstr "[Aplicaciones]({filename}apps.md)"
469+msgid "[Scopes]({filename}scopes.md)"
470+msgstr "[«Scopes»]({filename}scopes.es.md)"
471
472 #. type: Title ###
473 #: content/pages/faq.md:11
474 #, no-wrap
475-msgid "[Scopes]({filename}scopes.md)"
476-msgstr "[«Scopes»]({filename}scopes.md)"
477-
478-#. type: Title ###
479-#: content/pages/faq.md:12
480-#, no-wrap
481 msgid "[Security]({filename}security.md)"
482-msgstr "[Seguridad]({filename}security.md)"
483+msgstr "[Seguridad]({filename}security.es.md)"
484
485 #. type: Plain text
486 #: content/pages/index.md:2
487@@ -315,8 +306,8 @@
488 "The world-wide Ubuntu community wants to give you the best possible "
489 "experience on your Ubuntu device. This is why we collected:"
490 msgstr ""
491-"La comunidad mundial de Ubuntu quiere ofrecerle la mejor experiencia posible "
492-"en su dispositivo con Ubuntu. Por ello hemos recopilado:"
493+"La comunidad mundial de Ubuntu quiere ofrecerle la mejor experiencia posible"
494+" en su dispositivo con Ubuntu. Por ello hemos recopilado:"
495
496 #. type: Bullet: ' * '
497 #: content/pages/index.md:9
498@@ -339,6 +330,8 @@
499 "[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
500 "touch.md)"
501 msgstr ""
502+"[Take me to the FAQ!]({filename}faq.es.md) [Get in touch]({filename}get-in-"
503+"touch.md)"
504
505 #. type: Plain text
506 #: content/pages/settings.md:2
507@@ -415,8 +408,8 @@
508 #. type: Plain text
509 #: content/pages/settings.md:22
510 msgid ""
511-"You can set up some of your accounts from the scopes. Today scope allows you "
512-"to configure your Google and Fitbit account, while the Pictures scope lets "
513+"You can set up some of your accounts from the scopes. Today scope allows you"
514+" to configure your Google and Fitbit account, while the Pictures scope lets "
515 "you configure your flickr, Facebook and Instagram account. You can manage "
516 "all your accounts (including social media, email, etc) from the *System "
517 "Settings* app, under *Personal*, *Accounts*."
518@@ -474,8 +467,8 @@
519 #. type: Plain text
520 #: content/pages/ui.md:9
521 msgid ""
522-"The dash contains a list of applications installed on the device, along with "
523-"presenting the scopes and store. The dash is the first thing you see when "
524+"The dash contains a list of applications installed on the device, along with"
525+" presenting the scopes and store. The dash is the first thing you see when "
526 "booting the phone. You can switch to it again at any time by swiping left "
527 "from the right screen edge."
528 msgstr ""
529@@ -502,8 +495,8 @@
530 #. type: Plain text
531 #: content/pages/ui.md:15
532 msgid ""
533-"Indicators convey quick useful information about your device, like the time, "
534-"data connection, location, sound, and notifications. You can access the "
535+"Indicators convey quick useful information about your device, like the time,"
536+" data connection, location, sound, and notifications. You can access the "
537 "indicators at any time by swiping down from the top screen edge."
538 msgstr ""
539
540@@ -532,10 +525,10 @@
541 #. type: Plain text
542 #: content/pages/ui.md:22
543 msgid ""
544-"To close an application, slide your finger *slowly* left from the right edge "
545-"of the screen. An application switcher will appear. Place your finger on the "
546-"application preview you wish to close and swipe up or down. The application "
547-"will disappear."
548+"To close an application, slide your finger *slowly* left from the right edge"
549+" of the screen. An application switcher will appear. Place your finger on "
550+"the application preview you wish to close and swipe up or down. The "
551+"application will disappear."
552 msgstr ""
553
554 #. !!T
555@@ -547,8 +540,8 @@
556 #. type: Plain text
557 #: content/pages/ui.md:25
558 msgid ""
559-"For text that can be copied and pasted, press and hold the text in question. "
560-"A menu will appear allowing you to cut, copy and paste."
561+"For text that can be copied and pasted, press and hold the text in question."
562+" A menu will appear allowing you to cut, copy and paste."
563 msgstr ""
564
565 #. !!T
566@@ -590,8 +583,8 @@
567 #. type: Plain text
568 #: content/pages/ui.md:33
569 msgid ""
570-"The round circle is the infographic. It hows you recent phone activity, like "
571-"the number of messages received or the number of songs played."
572+"The round circle is the infographic. It hows you recent phone activity, like"
573+" the number of messages received or the number of songs played."
574 msgstr ""
575
576 #. type: Plain text
577@@ -629,8 +622,8 @@
578 #: content/pages/apps.md:14
579 msgid ""
580 "From the Apps scope, you can either tap on the “search” icon on the right "
581-"and start searching by name, or you can go all the way down in the scope and "
582-"tap on the Ubuntu Store icon."
583+"and start searching by name, or you can go all the way down in the scope and"
584+" tap on the Ubuntu Store icon."
585 msgstr ""
586
587 #. !!T
588@@ -703,8 +696,8 @@
589 #: content/pages/apps.md:34
590 msgid ""
591 "You can add music in multiple ways. If you have pre-existing music files, "
592-"simply connect your phone to your pc via the usb cable. Next, copy the music "
593-"you wish to listen to to the *Music* folder. Your music will appear in the "
594+"simply connect your phone to your pc via the usb cable. Next, copy the music"
595+" you wish to listen to to the *Music* folder. Your music will appear in the "
596 "music app. Alternatively, you can acquire music directly using the device "
597 "via a scope, such as grooveshark or by downloading via the browser or "
598 "another application."
599@@ -736,11 +729,11 @@
600 #. type: Plain text
601 #: content/pages/apps.md:42
602 msgid ""
603-"The first time you open the Contacts app you’ll be asked if you want to sync "
604-"contacts with your Google account. If you have answered “no” but change your "
605-"mind later, you can do so by going to the Today scope, and setting up your "
606-"Google account there. After that you can sync your contacts (and, if you "
607-"want, calendar events as well)."
608+"The first time you open the Contacts app you’ll be asked if you want to sync"
609+" contacts with your Google account. If you have answered “no” but change "
610+"your mind later, you can do so by going to the Today scope, and setting up "
611+"your Google account there. After that you can sync your contacts (and, if "
612+"you want, calendar events as well)."
613 msgstr ""
614
615 #. type: Title ##
616@@ -775,8 +768,8 @@
617 msgid ""
618 "If you've just taken a video, share it easily by swiping to the left from "
619 "the right edge inside the camera app. Alternatively, use the gallery app to "
620-"find the video. Once loaded, select *Share* from the menu and choose how you "
621-"wish to share your video."
622+"find the video. Once loaded, select *Share* from the menu and choose how you"
623+" wish to share your video."
624 msgstr ""
625
626 #. type: Title ##
627@@ -807,8 +800,8 @@
628 #. type: Plain text
629 #: content/pages/apps.md:60
630 msgid ""
631-"Use the gallery app to select your picture. Select the *Edit* button next to "
632-"the menu. Inside you'll find options to crop and rotate your picture."
633+"Use the gallery app to select your picture. Select the *Edit* button next to"
634+" the menu. Inside you'll find options to crop and rotate your picture."
635 msgstr ""
636
637 #. !!T
638@@ -939,8 +932,8 @@
639 #: content/pages/scopes.md:9
640 msgid ""
641 "Swipe up from the bottom edge of the dash to reveal a scopes manager. "
642-"Favorite scopes you wish to appear on your dash by selecting them. Selecting "
643-"them again will remove the favorite. All favorited scopes will appear on "
644+"Favorite scopes you wish to appear on your dash by selecting them. Selecting"
645+" them again will remove the favorite. All favorited scopes will appear on "
646 "your dash."
647 msgstr ""
648
649@@ -973,3 +966,15 @@
650 "will remove it from your dash. If you'd like to remove it completely, visit "
651 "the scope page in the ubuntu store and select *Uninstall*."
652 msgstr ""
653+
654+#. !!T
655+#: content/pages/security.md:25
656+#, no-wrap
657+msgid "I forgot my password or passcode. How can I unlock the phone?"
658+msgstr ""
659+
660+#~ msgid "[The Store]({filename}store.md)"
661+#~ msgstr ""
662+
663+#~ msgid "I forgot my passworde/security code. How can I unlock the phone?"
664+#~ msgstr ""
665
666=== modified file 'edit-here/po/fr.po'
667--- edit-here/po/fr.po 2015-03-19 06:02:42 +0000
668+++ edit-here/po/fr.po 2015-03-19 08:34:04 +0000
669@@ -2,7 +2,7 @@
670 # Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
671 # This file is distributed under the same license as the ubuntu-devices-help package.
672 # FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
673-#
674+#
675 msgid ""
676 msgstr ""
677 "Project-Id-Version: ubuntu-devices-help\n"
678@@ -14,8 +14,8 @@
679 "MIME-Version: 1.0\n"
680 "Content-Type: text/plain; charset=UTF-8\n"
681 "Content-Transfer-Encoding: 8bit\n"
682+"X-Generator: Launchpad (build 17403)\n"
683 "X-Launchpad-Export-Date: 2015-03-19 06:02+0000\n"
684-"X-Generator: Launchpad (build 17403)\n"
685
686 #. type: Plain text
687 #: content/pages/security.md:2
688@@ -33,7 +33,7 @@
689 #: content/pages/settings.md:6 content/pages/ui.md:6 content/pages/apps.md:7
690 #: content/pages/scopes.md:6
691 msgid "[TOC]"
692-msgstr ""
693+msgstr "[TOC]"
694
695 #. !!T
696 #: content/pages/security.md:7
697@@ -93,8 +93,8 @@
698 #: content/pages/security.md:19
699 #, no-wrap
700 msgid ""
701-"Why do I have to type my PIN when using File Manager & Terminal (not default "
702-"apps)?"
703+"Why do I have to type my PIN when using File Manager & Terminal (not default"
704+" apps)?"
705 msgstr ""
706
707 #. type: Plain text
708@@ -120,12 +120,6 @@
709 "settings* option."
710 msgstr ""
711
712-#. !!T
713-#: content/pages/security.md:25
714-#, no-wrap
715-msgid "I forgot my passworde/security code. How can I unlock the phone?"
716-msgstr ""
717-
718 #. type: Plain text
719 #: content/pages/security.md:26
720 msgid "TBD"
721@@ -152,9 +146,12 @@
722 #: content/pages/basic.md:9
723 msgid ""
724 "The music app let's you play music copied to the device. In addition, "
725-"[scopes]({filename}scopes.md) such as 7digital and Grooveshark can also play "
726-"music."
727+"[scopes]({filename}scopes.md) such as 7digital and Grooveshark can also play"
728+" music."
729 msgstr ""
730+"The music app let's you play music copied to the device. In addition, "
731+"[scopes]({filename}scopes.fr.md) such as 7digital and Grooveshark can also "
732+"play music."
733
734 #. !!T
735 #: content/pages/basic.md:10
736@@ -165,8 +162,8 @@
737 #. type: Plain text
738 #: content/pages/basic.md:12
739 msgid ""
740-"The media player application will play videos copied to the device. You will "
741-"also find applications like youtube that give you streaming options."
742+"The media player application will play videos copied to the device. You will"
743+" also find applications like youtube that give you streaming options."
744 msgstr ""
745
746 #. !!T
747@@ -204,8 +201,8 @@
748 #. type: Plain text
749 #: content/pages/basic.md:21
750 msgid ""
751-"If you've just taken a picture, you can see it easily by swiping to the left "
752-"from the right edge inside the camera app. Alternatively, use the gallery "
753+"If you've just taken a picture, you can see it easily by swiping to the left"
754+" from the right edge inside the camera app. Alternatively, use the gallery "
755 "app to find the picture."
756 msgstr ""
757
758@@ -264,43 +261,37 @@
759 #: content/pages/faq.md:6
760 #, no-wrap
761 msgid "[First day tasks]({filename}basic.md)"
762-msgstr ""
763+msgstr "[First day tasks]({filename}basic.fr.md)"
764
765 #. type: Title ###
766 #: content/pages/faq.md:7
767 #, no-wrap
768 msgid "[User Interface]({filename}ui.md)"
769-msgstr ""
770+msgstr "[User Interface]({filename}ui.fr.md)"
771
772 #. type: Title ###
773 #: content/pages/faq.md:8
774 #, no-wrap
775 msgid "[Settings]({filename}settings.md)"
776-msgstr ""
777+msgstr "[Settings]({filename}settings.fr.md)"
778
779 #. type: Title ###
780 #: content/pages/faq.md:9
781 #, no-wrap
782-msgid "[The Store]({filename}store.md)"
783-msgstr ""
784+msgid "[Apps]({filename}apps.md)"
785+msgstr "[Apps]({filename}apps.fr.md)"
786
787 #. type: Title ###
788 #: content/pages/faq.md:10
789 #, no-wrap
790-msgid "[Apps]({filename}apps.md)"
791-msgstr ""
792+msgid "[Scopes]({filename}scopes.md)"
793+msgstr "[Scopes]({filename}scopes.fr.md)"
794
795 #. type: Title ###
796 #: content/pages/faq.md:11
797 #, no-wrap
798-msgid "[Scopes]({filename}scopes.md)"
799-msgstr ""
800-
801-#. type: Title ###
802-#: content/pages/faq.md:12
803-#, no-wrap
804 msgid "[Security]({filename}security.md)"
805-msgstr ""
806+msgstr "[Security]({filename}security.fr.md)"
807
808 #. type: Plain text
809 #: content/pages/index.md:2
810@@ -335,6 +326,8 @@
811 "[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
812 "touch.md)"
813 msgstr ""
814+"[Take me to the FAQ!]({filename}faq.fr.md) [Get in touch]({filename}get-in-"
815+"touch.md)"
816
817 #. type: Plain text
818 #: content/pages/settings.md:2
819@@ -411,8 +404,8 @@
820 #. type: Plain text
821 #: content/pages/settings.md:22
822 msgid ""
823-"You can set up some of your accounts from the scopes. Today scope allows you "
824-"to configure your Google and Fitbit account, while the Pictures scope lets "
825+"You can set up some of your accounts from the scopes. Today scope allows you"
826+" to configure your Google and Fitbit account, while the Pictures scope lets "
827 "you configure your flickr, Facebook and Instagram account. You can manage "
828 "all your accounts (including social media, email, etc) from the *System "
829 "Settings* app, under *Personal*, *Accounts*."
830@@ -470,8 +463,8 @@
831 #. type: Plain text
832 #: content/pages/ui.md:9
833 msgid ""
834-"The dash contains a list of applications installed on the device, along with "
835-"presenting the scopes and store. The dash is the first thing you see when "
836+"The dash contains a list of applications installed on the device, along with"
837+" presenting the scopes and store. The dash is the first thing you see when "
838 "booting the phone. You can switch to it again at any time by swiping left "
839 "from the right screen edge."
840 msgstr ""
841@@ -498,8 +491,8 @@
842 #. type: Plain text
843 #: content/pages/ui.md:15
844 msgid ""
845-"Indicators convey quick useful information about your device, like the time, "
846-"data connection, location, sound, and notifications. You can access the "
847+"Indicators convey quick useful information about your device, like the time,"
848+" data connection, location, sound, and notifications. You can access the "
849 "indicators at any time by swiping down from the top screen edge."
850 msgstr ""
851
852@@ -528,10 +521,10 @@
853 #. type: Plain text
854 #: content/pages/ui.md:22
855 msgid ""
856-"To close an application, slide your finger *slowly* left from the right edge "
857-"of the screen. An application switcher will appear. Place your finger on the "
858-"application preview you wish to close and swipe up or down. The application "
859-"will disappear."
860+"To close an application, slide your finger *slowly* left from the right edge"
861+" of the screen. An application switcher will appear. Place your finger on "
862+"the application preview you wish to close and swipe up or down. The "
863+"application will disappear."
864 msgstr ""
865
866 #. !!T
867@@ -543,8 +536,8 @@
868 #. type: Plain text
869 #: content/pages/ui.md:25
870 msgid ""
871-"For text that can be copied and pasted, press and hold the text in question. "
872-"A menu will appear allowing you to cut, copy and paste."
873+"For text that can be copied and pasted, press and hold the text in question."
874+" A menu will appear allowing you to cut, copy and paste."
875 msgstr ""
876
877 #. !!T
878@@ -586,8 +579,8 @@
879 #. type: Plain text
880 #: content/pages/ui.md:33
881 msgid ""
882-"The round circle is the infographic. It hows you recent phone activity, like "
883-"the number of messages received or the number of songs played."
884+"The round circle is the infographic. It hows you recent phone activity, like"
885+" the number of messages received or the number of songs played."
886 msgstr ""
887
888 #. type: Plain text
889@@ -625,8 +618,8 @@
890 #: content/pages/apps.md:14
891 msgid ""
892 "From the Apps scope, you can either tap on the “search” icon on the right "
893-"and start searching by name, or you can go all the way down in the scope and "
894-"tap on the Ubuntu Store icon."
895+"and start searching by name, or you can go all the way down in the scope and"
896+" tap on the Ubuntu Store icon."
897 msgstr ""
898
899 #. !!T
900@@ -699,8 +692,8 @@
901 #: content/pages/apps.md:34
902 msgid ""
903 "You can add music in multiple ways. If you have pre-existing music files, "
904-"simply connect your phone to your pc via the usb cable. Next, copy the music "
905-"you wish to listen to to the *Music* folder. Your music will appear in the "
906+"simply connect your phone to your pc via the usb cable. Next, copy the music"
907+" you wish to listen to to the *Music* folder. Your music will appear in the "
908 "music app. Alternatively, you can acquire music directly using the device "
909 "via a scope, such as grooveshark or by downloading via the browser or "
910 "another application."
911@@ -732,11 +725,11 @@
912 #. type: Plain text
913 #: content/pages/apps.md:42
914 msgid ""
915-"The first time you open the Contacts app you’ll be asked if you want to sync "
916-"contacts with your Google account. If you have answered “no” but change your "
917-"mind later, you can do so by going to the Today scope, and setting up your "
918-"Google account there. After that you can sync your contacts (and, if you "
919-"want, calendar events as well)."
920+"The first time you open the Contacts app you’ll be asked if you want to sync"
921+" contacts with your Google account. If you have answered “no” but change "
922+"your mind later, you can do so by going to the Today scope, and setting up "
923+"your Google account there. After that you can sync your contacts (and, if "
924+"you want, calendar events as well)."
925 msgstr ""
926
927 #. type: Title ##
928@@ -771,8 +764,8 @@
929 msgid ""
930 "If you've just taken a video, share it easily by swiping to the left from "
931 "the right edge inside the camera app. Alternatively, use the gallery app to "
932-"find the video. Once loaded, select *Share* from the menu and choose how you "
933-"wish to share your video."
934+"find the video. Once loaded, select *Share* from the menu and choose how you"
935+" wish to share your video."
936 msgstr ""
937
938 #. type: Title ##
939@@ -803,8 +796,8 @@
940 #. type: Plain text
941 #: content/pages/apps.md:60
942 msgid ""
943-"Use the gallery app to select your picture. Select the *Edit* button next to "
944-"the menu. Inside you'll find options to crop and rotate your picture."
945+"Use the gallery app to select your picture. Select the *Edit* button next to"
946+" the menu. Inside you'll find options to crop and rotate your picture."
947 msgstr ""
948
949 #. !!T
950@@ -935,8 +928,8 @@
951 #: content/pages/scopes.md:9
952 msgid ""
953 "Swipe up from the bottom edge of the dash to reveal a scopes manager. "
954-"Favorite scopes you wish to appear on your dash by selecting them. Selecting "
955-"them again will remove the favorite. All favorited scopes will appear on "
956+"Favorite scopes you wish to appear on your dash by selecting them. Selecting"
957+" them again will remove the favorite. All favorited scopes will appear on "
958 "your dash."
959 msgstr ""
960
961@@ -969,3 +962,15 @@
962 "will remove it from your dash. If you'd like to remove it completely, visit "
963 "the scope page in the ubuntu store and select *Uninstall*."
964 msgstr ""
965+
966+#. !!T
967+#: content/pages/security.md:25
968+#, no-wrap
969+msgid "I forgot my password or passcode. How can I unlock the phone?"
970+msgstr ""
971+
972+#~ msgid "[The Store]({filename}store.md)"
973+#~ msgstr ""
974+
975+#~ msgid "I forgot my passworde/security code. How can I unlock the phone?"
976+#~ msgstr ""
977
978=== modified file 'edit-here/po/help.pot'
979--- edit-here/po/help.pot 2015-03-18 15:56:30 +0000
980+++ edit-here/po/help.pot 2015-03-19 08:34:04 +0000
981@@ -7,7 +7,7 @@
982 msgid ""
983 msgstr ""
984 "Project-Id-Version: PACKAGE VERSION\n"
985-"POT-Creation-Date: 2015-03-18 16:55+0100\n"
986+"POT-Creation-Date: 2015-03-19 09:33+0100\n"
987 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
988 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
989 "Language-Team: LANGUAGE <LL@li.org>\n"
990@@ -122,7 +122,7 @@
991 #. !!T
992 #: content/pages/security.md:25
993 #, no-wrap
994-msgid "I forgot my passworde/security code. How can I unlock the phone?"
995+msgid "I forgot my password or passcode. How can I unlock the phone?"
996 msgstr ""
997
998 #. type: Plain text
999@@ -280,24 +280,18 @@
1000 #. type: Title ###
1001 #: content/pages/faq.md:9
1002 #, no-wrap
1003-msgid "[The Store]({filename}store.md)"
1004+msgid "[Apps]({filename}apps.md)"
1005 msgstr ""
1006
1007 #. type: Title ###
1008 #: content/pages/faq.md:10
1009 #, no-wrap
1010-msgid "[Apps]({filename}apps.md)"
1011+msgid "[Scopes]({filename}scopes.md)"
1012 msgstr ""
1013
1014 #. type: Title ###
1015 #: content/pages/faq.md:11
1016 #, no-wrap
1017-msgid "[Scopes]({filename}scopes.md)"
1018-msgstr ""
1019-
1020-#. type: Title ###
1021-#: content/pages/faq.md:12
1022-#, no-wrap
1023 msgid "[Security]({filename}security.md)"
1024 msgstr ""
1025
1026
1027=== modified file 'edit-here/po/it.po'
1028--- edit-here/po/it.po 2015-03-19 06:02:42 +0000
1029+++ edit-here/po/it.po 2015-03-19 08:34:04 +0000
1030@@ -2,7 +2,7 @@
1031 # Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
1032 # This file is distributed under the same license as the ubuntu-devices-help package.
1033 # FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
1034-#
1035+#
1036 msgid ""
1037 msgstr ""
1038 "Project-Id-Version: ubuntu-devices-help\n"
1039@@ -14,8 +14,8 @@
1040 "MIME-Version: 1.0\n"
1041 "Content-Type: text/plain; charset=UTF-8\n"
1042 "Content-Transfer-Encoding: 8bit\n"
1043+"X-Generator: Launchpad (build 17403)\n"
1044 "X-Launchpad-Export-Date: 2015-03-19 06:02+0000\n"
1045-"X-Generator: Launchpad (build 17403)\n"
1046
1047 #. type: Plain text
1048 #: content/pages/security.md:2
1049@@ -33,7 +33,7 @@
1050 #: content/pages/settings.md:6 content/pages/ui.md:6 content/pages/apps.md:7
1051 #: content/pages/scopes.md:6
1052 msgid "[TOC]"
1053-msgstr ""
1054+msgstr "[TOC]"
1055
1056 #. !!T
1057 #: content/pages/security.md:7
1058@@ -93,8 +93,8 @@
1059 #: content/pages/security.md:19
1060 #, no-wrap
1061 msgid ""
1062-"Why do I have to type my PIN when using File Manager & Terminal (not default "
1063-"apps)?"
1064+"Why do I have to type my PIN when using File Manager & Terminal (not default"
1065+" apps)?"
1066 msgstr ""
1067
1068 #. type: Plain text
1069@@ -120,12 +120,6 @@
1070 "settings* option."
1071 msgstr ""
1072
1073-#. !!T
1074-#: content/pages/security.md:25
1075-#, no-wrap
1076-msgid "I forgot my passworde/security code. How can I unlock the phone?"
1077-msgstr ""
1078-
1079 #. type: Plain text
1080 #: content/pages/security.md:26
1081 msgid "TBD"
1082@@ -152,9 +146,12 @@
1083 #: content/pages/basic.md:9
1084 msgid ""
1085 "The music app let's you play music copied to the device. In addition, "
1086-"[scopes]({filename}scopes.md) such as 7digital and Grooveshark can also play "
1087-"music."
1088+"[scopes]({filename}scopes.md) such as 7digital and Grooveshark can also play"
1089+" music."
1090 msgstr ""
1091+"The music app let's you play music copied to the device. In addition, "
1092+"[scopes]({filename}scopes.it.md) such as 7digital and Grooveshark can also "
1093+"play music."
1094
1095 #. !!T
1096 #: content/pages/basic.md:10
1097@@ -165,8 +162,8 @@
1098 #. type: Plain text
1099 #: content/pages/basic.md:12
1100 msgid ""
1101-"The media player application will play videos copied to the device. You will "
1102-"also find applications like youtube that give you streaming options."
1103+"The media player application will play videos copied to the device. You will"
1104+" also find applications like youtube that give you streaming options."
1105 msgstr ""
1106
1107 #. !!T
1108@@ -204,8 +201,8 @@
1109 #. type: Plain text
1110 #: content/pages/basic.md:21
1111 msgid ""
1112-"If you've just taken a picture, you can see it easily by swiping to the left "
1113-"from the right edge inside the camera app. Alternatively, use the gallery "
1114+"If you've just taken a picture, you can see it easily by swiping to the left"
1115+" from the right edge inside the camera app. Alternatively, use the gallery "
1116 "app to find the picture."
1117 msgstr ""
1118
1119@@ -266,43 +263,37 @@
1120 #: content/pages/faq.md:6
1121 #, no-wrap
1122 msgid "[First day tasks]({filename}basic.md)"
1123-msgstr ""
1124+msgstr "[First day tasks]({filename}basic.it.md)"
1125
1126 #. type: Title ###
1127 #: content/pages/faq.md:7
1128 #, no-wrap
1129 msgid "[User Interface]({filename}ui.md)"
1130-msgstr ""
1131+msgstr "[User Interface]({filename}ui.it.md)"
1132
1133 #. type: Title ###
1134 #: content/pages/faq.md:8
1135 #, no-wrap
1136 msgid "[Settings]({filename}settings.md)"
1137-msgstr ""
1138+msgstr "[Settings]({filename}settings.it.md)"
1139
1140 #. type: Title ###
1141 #: content/pages/faq.md:9
1142 #, no-wrap
1143-msgid "[The Store]({filename}store.md)"
1144-msgstr ""
1145+msgid "[Apps]({filename}apps.md)"
1146+msgstr "[Apps]({filename}apps.it.md)"
1147
1148 #. type: Title ###
1149 #: content/pages/faq.md:10
1150 #, no-wrap
1151-msgid "[Apps]({filename}apps.md)"
1152-msgstr ""
1153+msgid "[Scopes]({filename}scopes.md)"
1154+msgstr "[Scopes]({filename}scopes.it.md)"
1155
1156 #. type: Title ###
1157 #: content/pages/faq.md:11
1158 #, no-wrap
1159-msgid "[Scopes]({filename}scopes.md)"
1160-msgstr ""
1161-
1162-#. type: Title ###
1163-#: content/pages/faq.md:12
1164-#, no-wrap
1165 msgid "[Security]({filename}security.md)"
1166-msgstr ""
1167+msgstr "[Security]({filename}security.it.md)"
1168
1169 #. type: Plain text
1170 #: content/pages/index.md:2
1171@@ -339,6 +330,8 @@
1172 "[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
1173 "touch.md)"
1174 msgstr ""
1175+"[Take me to the FAQ!]({filename}faq.it.md) [Get in touch]({filename}get-in-"
1176+"touch.md)"
1177
1178 #. type: Plain text
1179 #: content/pages/settings.md:2
1180@@ -415,8 +408,8 @@
1181 #. type: Plain text
1182 #: content/pages/settings.md:22
1183 msgid ""
1184-"You can set up some of your accounts from the scopes. Today scope allows you "
1185-"to configure your Google and Fitbit account, while the Pictures scope lets "
1186+"You can set up some of your accounts from the scopes. Today scope allows you"
1187+" to configure your Google and Fitbit account, while the Pictures scope lets "
1188 "you configure your flickr, Facebook and Instagram account. You can manage "
1189 "all your accounts (including social media, email, etc) from the *System "
1190 "Settings* app, under *Personal*, *Accounts*."
1191@@ -474,8 +467,8 @@
1192 #. type: Plain text
1193 #: content/pages/ui.md:9
1194 msgid ""
1195-"The dash contains a list of applications installed on the device, along with "
1196-"presenting the scopes and store. The dash is the first thing you see when "
1197+"The dash contains a list of applications installed on the device, along with"
1198+" presenting the scopes and store. The dash is the first thing you see when "
1199 "booting the phone. You can switch to it again at any time by swiping left "
1200 "from the right screen edge."
1201 msgstr ""
1202@@ -502,8 +495,8 @@
1203 #. type: Plain text
1204 #: content/pages/ui.md:15
1205 msgid ""
1206-"Indicators convey quick useful information about your device, like the time, "
1207-"data connection, location, sound, and notifications. You can access the "
1208+"Indicators convey quick useful information about your device, like the time,"
1209+" data connection, location, sound, and notifications. You can access the "
1210 "indicators at any time by swiping down from the top screen edge."
1211 msgstr ""
1212
1213@@ -532,10 +525,10 @@
1214 #. type: Plain text
1215 #: content/pages/ui.md:22
1216 msgid ""
1217-"To close an application, slide your finger *slowly* left from the right edge "
1218-"of the screen. An application switcher will appear. Place your finger on the "
1219-"application preview you wish to close and swipe up or down. The application "
1220-"will disappear."
1221+"To close an application, slide your finger *slowly* left from the right edge"
1222+" of the screen. An application switcher will appear. Place your finger on "
1223+"the application preview you wish to close and swipe up or down. The "
1224+"application will disappear."
1225 msgstr ""
1226
1227 #. !!T
1228@@ -547,8 +540,8 @@
1229 #. type: Plain text
1230 #: content/pages/ui.md:25
1231 msgid ""
1232-"For text that can be copied and pasted, press and hold the text in question. "
1233-"A menu will appear allowing you to cut, copy and paste."
1234+"For text that can be copied and pasted, press and hold the text in question."
1235+" A menu will appear allowing you to cut, copy and paste."
1236 msgstr ""
1237
1238 #. !!T
1239@@ -590,8 +583,8 @@
1240 #. type: Plain text
1241 #: content/pages/ui.md:33
1242 msgid ""
1243-"The round circle is the infographic. It hows you recent phone activity, like "
1244-"the number of messages received or the number of songs played."
1245+"The round circle is the infographic. It hows you recent phone activity, like"
1246+" the number of messages received or the number of songs played."
1247 msgstr ""
1248
1249 #. type: Plain text
1250@@ -629,8 +622,8 @@
1251 #: content/pages/apps.md:14
1252 msgid ""
1253 "From the Apps scope, you can either tap on the “search” icon on the right "
1254-"and start searching by name, or you can go all the way down in the scope and "
1255-"tap on the Ubuntu Store icon."
1256+"and start searching by name, or you can go all the way down in the scope and"
1257+" tap on the Ubuntu Store icon."
1258 msgstr ""
1259
1260 #. !!T
1261@@ -703,8 +696,8 @@
1262 #: content/pages/apps.md:34
1263 msgid ""
1264 "You can add music in multiple ways. If you have pre-existing music files, "
1265-"simply connect your phone to your pc via the usb cable. Next, copy the music "
1266-"you wish to listen to to the *Music* folder. Your music will appear in the "
1267+"simply connect your phone to your pc via the usb cable. Next, copy the music"
1268+" you wish to listen to to the *Music* folder. Your music will appear in the "
1269 "music app. Alternatively, you can acquire music directly using the device "
1270 "via a scope, such as grooveshark or by downloading via the browser or "
1271 "another application."
1272@@ -736,11 +729,11 @@
1273 #. type: Plain text
1274 #: content/pages/apps.md:42
1275 msgid ""
1276-"The first time you open the Contacts app you’ll be asked if you want to sync "
1277-"contacts with your Google account. If you have answered “no” but change your "
1278-"mind later, you can do so by going to the Today scope, and setting up your "
1279-"Google account there. After that you can sync your contacts (and, if you "
1280-"want, calendar events as well)."
1281+"The first time you open the Contacts app you’ll be asked if you want to sync"
1282+" contacts with your Google account. If you have answered “no” but change "
1283+"your mind later, you can do so by going to the Today scope, and setting up "
1284+"your Google account there. After that you can sync your contacts (and, if "
1285+"you want, calendar events as well)."
1286 msgstr ""
1287
1288 #. type: Title ##
1289@@ -775,8 +768,8 @@
1290 msgid ""
1291 "If you've just taken a video, share it easily by swiping to the left from "
1292 "the right edge inside the camera app. Alternatively, use the gallery app to "
1293-"find the video. Once loaded, select *Share* from the menu and choose how you "
1294-"wish to share your video."
1295+"find the video. Once loaded, select *Share* from the menu and choose how you"
1296+" wish to share your video."
1297 msgstr ""
1298
1299 #. type: Title ##
1300@@ -807,8 +800,8 @@
1301 #. type: Plain text
1302 #: content/pages/apps.md:60
1303 msgid ""
1304-"Use the gallery app to select your picture. Select the *Edit* button next to "
1305-"the menu. Inside you'll find options to crop and rotate your picture."
1306+"Use the gallery app to select your picture. Select the *Edit* button next to"
1307+" the menu. Inside you'll find options to crop and rotate your picture."
1308 msgstr ""
1309
1310 #. !!T
1311@@ -939,8 +932,8 @@
1312 #: content/pages/scopes.md:9
1313 msgid ""
1314 "Swipe up from the bottom edge of the dash to reveal a scopes manager. "
1315-"Favorite scopes you wish to appear on your dash by selecting them. Selecting "
1316-"them again will remove the favorite. All favorited scopes will appear on "
1317+"Favorite scopes you wish to appear on your dash by selecting them. Selecting"
1318+" them again will remove the favorite. All favorited scopes will appear on "
1319 "your dash."
1320 msgstr ""
1321
1322@@ -973,3 +966,15 @@
1323 "will remove it from your dash. If you'd like to remove it completely, visit "
1324 "the scope page in the ubuntu store and select *Uninstall*."
1325 msgstr ""
1326+
1327+#. !!T
1328+#: content/pages/security.md:25
1329+#, no-wrap
1330+msgid "I forgot my password or passcode. How can I unlock the phone?"
1331+msgstr ""
1332+
1333+#~ msgid "[The Store]({filename}store.md)"
1334+#~ msgstr ""
1335+
1336+#~ msgid "I forgot my passworde/security code. How can I unlock the phone?"
1337+#~ msgstr ""
1338
1339=== modified file 'edit-here/po/pt.po'
1340--- edit-here/po/pt.po 2015-03-19 06:02:42 +0000
1341+++ edit-here/po/pt.po 2015-03-19 08:34:04 +0000
1342@@ -2,7 +2,7 @@
1343 # Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
1344 # This file is distributed under the same license as the ubuntu-devices-help package.
1345 # FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
1346-#
1347+#
1348 msgid ""
1349 msgstr ""
1350 "Project-Id-Version: ubuntu-devices-help\n"
1351@@ -14,8 +14,8 @@
1352 "MIME-Version: 1.0\n"
1353 "Content-Type: text/plain; charset=UTF-8\n"
1354 "Content-Transfer-Encoding: 8bit\n"
1355+"X-Generator: Launchpad (build 17403)\n"
1356 "X-Launchpad-Export-Date: 2015-03-19 06:02+0000\n"
1357-"X-Generator: Launchpad (build 17403)\n"
1358
1359 #. type: Plain text
1360 #: content/pages/security.md:2
1361@@ -33,7 +33,7 @@
1362 #: content/pages/settings.md:6 content/pages/ui.md:6 content/pages/apps.md:7
1363 #: content/pages/scopes.md:6
1364 msgid "[TOC]"
1365-msgstr ""
1366+msgstr "[TOC]"
1367
1368 #. !!T
1369 #: content/pages/security.md:7
1370@@ -93,8 +93,8 @@
1371 #: content/pages/security.md:19
1372 #, no-wrap
1373 msgid ""
1374-"Why do I have to type my PIN when using File Manager & Terminal (not default "
1375-"apps)?"
1376+"Why do I have to type my PIN when using File Manager & Terminal (not default"
1377+" apps)?"
1378 msgstr ""
1379
1380 #. type: Plain text
1381@@ -120,12 +120,6 @@
1382 "settings* option."
1383 msgstr ""
1384
1385-#. !!T
1386-#: content/pages/security.md:25
1387-#, no-wrap
1388-msgid "I forgot my passworde/security code. How can I unlock the phone?"
1389-msgstr ""
1390-
1391 #. type: Plain text
1392 #: content/pages/security.md:26
1393 msgid "TBD"
1394@@ -140,8 +134,7 @@
1395 #: content/pages/basic.md:4
1396 #, no-wrap
1397 msgid "*If you are wondering how to perform basic tasks, look here.*\n"
1398-msgstr ""
1399-"*Se está à procura de como fazer as tarefas básicas, procure aqui.*\n"
1400+msgstr "*Se está à procura de como fazer as tarefas básicas, procure aqui.*\n"
1401
1402 #. !!T
1403 #: content/pages/basic.md:7
1404@@ -153,9 +146,12 @@
1405 #: content/pages/basic.md:9
1406 msgid ""
1407 "The music app let's you play music copied to the device. In addition, "
1408-"[scopes]({filename}scopes.md) such as 7digital and Grooveshark can also play "
1409-"music."
1410+"[scopes]({filename}scopes.md) such as 7digital and Grooveshark can also play"
1411+" music."
1412 msgstr ""
1413+"The music app let's you play music copied to the device. In addition, "
1414+"[scopes]({filename}scopes.pt.md) such as 7digital and Grooveshark can also "
1415+"play music."
1416
1417 #. !!T
1418 #: content/pages/basic.md:10
1419@@ -166,8 +162,8 @@
1420 #. type: Plain text
1421 #: content/pages/basic.md:12
1422 msgid ""
1423-"The media player application will play videos copied to the device. You will "
1424-"also find applications like youtube that give you streaming options."
1425+"The media player application will play videos copied to the device. You will"
1426+" also find applications like youtube that give you streaming options."
1427 msgstr ""
1428
1429 #. !!T
1430@@ -205,8 +201,8 @@
1431 #. type: Plain text
1432 #: content/pages/basic.md:21
1433 msgid ""
1434-"If you've just taken a picture, you can see it easily by swiping to the left "
1435-"from the right edge inside the camera app. Alternatively, use the gallery "
1436+"If you've just taken a picture, you can see it easily by swiping to the left"
1437+" from the right edge inside the camera app. Alternatively, use the gallery "
1438 "app to find the picture."
1439 msgstr ""
1440
1441@@ -267,43 +263,37 @@
1442 #: content/pages/faq.md:6
1443 #, no-wrap
1444 msgid "[First day tasks]({filename}basic.md)"
1445-msgstr ""
1446+msgstr "[First day tasks]({filename}basic.pt.md)"
1447
1448 #. type: Title ###
1449 #: content/pages/faq.md:7
1450 #, no-wrap
1451 msgid "[User Interface]({filename}ui.md)"
1452-msgstr "[User Interface]({filename}ui.md)"
1453+msgstr "[User Interface]({filename}ui.pt.md)"
1454
1455 #. type: Title ###
1456 #: content/pages/faq.md:8
1457 #, no-wrap
1458 msgid "[Settings]({filename}settings.md)"
1459-msgstr "[Settings]({filename}settings.md)"
1460+msgstr "[Settings]({filename}settings.pt.md)"
1461
1462 #. type: Title ###
1463 #: content/pages/faq.md:9
1464 #, no-wrap
1465-msgid "[The Store]({filename}store.md)"
1466-msgstr ""
1467+msgid "[Apps]({filename}apps.md)"
1468+msgstr "[Apps]({filename}apps.pt.md)"
1469
1470 #. type: Title ###
1471 #: content/pages/faq.md:10
1472 #, no-wrap
1473-msgid "[Apps]({filename}apps.md)"
1474-msgstr "[Apps]({filename}apps.md)"
1475+msgid "[Scopes]({filename}scopes.md)"
1476+msgstr "[Scopes]({filename}scopes.pt.md)"
1477
1478 #. type: Title ###
1479 #: content/pages/faq.md:11
1480 #, no-wrap
1481-msgid "[Scopes]({filename}scopes.md)"
1482-msgstr "[Scopes]({filename}scopes.md)"
1483-
1484-#. type: Title ###
1485-#: content/pages/faq.md:12
1486-#, no-wrap
1487 msgid "[Security]({filename}security.md)"
1488-msgstr "[Security]({filename}security.md)"
1489+msgstr "[Security]({filename}security.pt.md)"
1490
1491 #. type: Plain text
1492 #: content/pages/index.md:2
1493@@ -340,6 +330,8 @@
1494 "[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
1495 "touch.md)"
1496 msgstr ""
1497+"[Take me to the FAQ!]({filename}faq.pt.md) [Get in touch]({filename}get-in-"
1498+"touch.md)"
1499
1500 #. type: Plain text
1501 #: content/pages/settings.md:2
1502@@ -416,8 +408,8 @@
1503 #. type: Plain text
1504 #: content/pages/settings.md:22
1505 msgid ""
1506-"You can set up some of your accounts from the scopes. Today scope allows you "
1507-"to configure your Google and Fitbit account, while the Pictures scope lets "
1508+"You can set up some of your accounts from the scopes. Today scope allows you"
1509+" to configure your Google and Fitbit account, while the Pictures scope lets "
1510 "you configure your flickr, Facebook and Instagram account. You can manage "
1511 "all your accounts (including social media, email, etc) from the *System "
1512 "Settings* app, under *Personal*, *Accounts*."
1513@@ -477,8 +469,8 @@
1514 #. type: Plain text
1515 #: content/pages/ui.md:9
1516 msgid ""
1517-"The dash contains a list of applications installed on the device, along with "
1518-"presenting the scopes and store. The dash is the first thing you see when "
1519+"The dash contains a list of applications installed on the device, along with"
1520+" presenting the scopes and store. The dash is the first thing you see when "
1521 "booting the phone. You can switch to it again at any time by swiping left "
1522 "from the right screen edge."
1523 msgstr ""
1524@@ -505,8 +497,8 @@
1525 #. type: Plain text
1526 #: content/pages/ui.md:15
1527 msgid ""
1528-"Indicators convey quick useful information about your device, like the time, "
1529-"data connection, location, sound, and notifications. You can access the "
1530+"Indicators convey quick useful information about your device, like the time,"
1531+" data connection, location, sound, and notifications. You can access the "
1532 "indicators at any time by swiping down from the top screen edge."
1533 msgstr ""
1534
1535@@ -535,10 +527,10 @@
1536 #. type: Plain text
1537 #: content/pages/ui.md:22
1538 msgid ""
1539-"To close an application, slide your finger *slowly* left from the right edge "
1540-"of the screen. An application switcher will appear. Place your finger on the "
1541-"application preview you wish to close and swipe up or down. The application "
1542-"will disappear."
1543+"To close an application, slide your finger *slowly* left from the right edge"
1544+" of the screen. An application switcher will appear. Place your finger on "
1545+"the application preview you wish to close and swipe up or down. The "
1546+"application will disappear."
1547 msgstr ""
1548
1549 #. !!T
1550@@ -550,8 +542,8 @@
1551 #. type: Plain text
1552 #: content/pages/ui.md:25
1553 msgid ""
1554-"For text that can be copied and pasted, press and hold the text in question. "
1555-"A menu will appear allowing you to cut, copy and paste."
1556+"For text that can be copied and pasted, press and hold the text in question."
1557+" A menu will appear allowing you to cut, copy and paste."
1558 msgstr ""
1559
1560 #. !!T
1561@@ -593,8 +585,8 @@
1562 #. type: Plain text
1563 #: content/pages/ui.md:33
1564 msgid ""
1565-"The round circle is the infographic. It hows you recent phone activity, like "
1566-"the number of messages received or the number of songs played."
1567+"The round circle is the infographic. It hows you recent phone activity, like"
1568+" the number of messages received or the number of songs played."
1569 msgstr ""
1570
1571 #. type: Plain text
1572@@ -609,8 +601,7 @@
1573 "*Are you looking for a good way to do X and can't find it in the app\n"
1574 "store? Want some suggestions to solve a particular problem?*\n"
1575 msgstr ""
1576-"*Está à procura de uma maneira para fazer bem X e não consegue encontrar na "
1577-"loja de\n"
1578+"*Está à procura de uma maneira para fazer bem X e não consegue encontrar na loja de\n"
1579 "aplicações? Quer alguma sugestão de como resolver um problema particular?*\n"
1580
1581 #. type: Title ##
1582@@ -635,8 +626,8 @@
1583 #: content/pages/apps.md:14
1584 msgid ""
1585 "From the Apps scope, you can either tap on the “search” icon on the right "
1586-"and start searching by name, or you can go all the way down in the scope and "
1587-"tap on the Ubuntu Store icon."
1588+"and start searching by name, or you can go all the way down in the scope and"
1589+" tap on the Ubuntu Store icon."
1590 msgstr ""
1591
1592 #. !!T
1593@@ -709,8 +700,8 @@
1594 #: content/pages/apps.md:34
1595 msgid ""
1596 "You can add music in multiple ways. If you have pre-existing music files, "
1597-"simply connect your phone to your pc via the usb cable. Next, copy the music "
1598-"you wish to listen to to the *Music* folder. Your music will appear in the "
1599+"simply connect your phone to your pc via the usb cable. Next, copy the music"
1600+" you wish to listen to to the *Music* folder. Your music will appear in the "
1601 "music app. Alternatively, you can acquire music directly using the device "
1602 "via a scope, such as grooveshark or by downloading via the browser or "
1603 "another application."
1604@@ -742,11 +733,11 @@
1605 #. type: Plain text
1606 #: content/pages/apps.md:42
1607 msgid ""
1608-"The first time you open the Contacts app you’ll be asked if you want to sync "
1609-"contacts with your Google account. If you have answered “no” but change your "
1610-"mind later, you can do so by going to the Today scope, and setting up your "
1611-"Google account there. After that you can sync your contacts (and, if you "
1612-"want, calendar events as well)."
1613+"The first time you open the Contacts app you’ll be asked if you want to sync"
1614+" contacts with your Google account. If you have answered “no” but change "
1615+"your mind later, you can do so by going to the Today scope, and setting up "
1616+"your Google account there. After that you can sync your contacts (and, if "
1617+"you want, calendar events as well)."
1618 msgstr ""
1619
1620 #. type: Title ##
1621@@ -781,8 +772,8 @@
1622 msgid ""
1623 "If you've just taken a video, share it easily by swiping to the left from "
1624 "the right edge inside the camera app. Alternatively, use the gallery app to "
1625-"find the video. Once loaded, select *Share* from the menu and choose how you "
1626-"wish to share your video."
1627+"find the video. Once loaded, select *Share* from the menu and choose how you"
1628+" wish to share your video."
1629 msgstr ""
1630
1631 #. type: Title ##
1632@@ -813,8 +804,8 @@
1633 #. type: Plain text
1634 #: content/pages/apps.md:60
1635 msgid ""
1636-"Use the gallery app to select your picture. Select the *Edit* button next to "
1637-"the menu. Inside you'll find options to crop and rotate your picture."
1638+"Use the gallery app to select your picture. Select the *Edit* button next to"
1639+" the menu. Inside you'll find options to crop and rotate your picture."
1640 msgstr ""
1641
1642 #. !!T
1643@@ -914,8 +905,7 @@
1644 "collaboratively-edited question and answer site for Ubuntu users and \n"
1645 "developers. 100% free, no registration required. \n"
1646 msgstr ""
1647-"O Ubuntu tem uma grande comunidade . Pode facilmente entrar em contacto com "
1648-"peritos e\n"
1649+"O Ubuntu tem uma grande comunidade . Pode facilmente entrar em contacto com peritos e\n"
1650 "outros entusiastas. Um bom modo de o fazer, particularmente se**tiver \n"
1651 "questões**, é através [AskUbuntu](http://www.askubuntu.com). É uma \n"
1652 " página de perguntas e respostas colaborativa para utilizadores Ubuntu e \n"
1653@@ -955,8 +945,8 @@
1654 #: content/pages/scopes.md:9
1655 msgid ""
1656 "Swipe up from the bottom edge of the dash to reveal a scopes manager. "
1657-"Favorite scopes you wish to appear on your dash by selecting them. Selecting "
1658-"them again will remove the favorite. All favorited scopes will appear on "
1659+"Favorite scopes you wish to appear on your dash by selecting them. Selecting"
1660+" them again will remove the favorite. All favorited scopes will appear on "
1661 "your dash."
1662 msgstr ""
1663
1664@@ -989,3 +979,15 @@
1665 "will remove it from your dash. If you'd like to remove it completely, visit "
1666 "the scope page in the ubuntu store and select *Uninstall*."
1667 msgstr ""
1668+
1669+#. !!T
1670+#: content/pages/security.md:25
1671+#, no-wrap
1672+msgid "I forgot my password or passcode. How can I unlock the phone?"
1673+msgstr ""
1674+
1675+#~ msgid "[The Store]({filename}store.md)"
1676+#~ msgstr ""
1677+
1678+#~ msgid "I forgot my passworde/security code. How can I unlock the phone?"
1679+#~ msgstr ""
1680
1681=== modified file 'edit-here/po/ro.po'
1682--- edit-here/po/ro.po 2015-03-19 06:02:42 +0000
1683+++ edit-here/po/ro.po 2015-03-19 08:34:04 +0000
1684@@ -2,7 +2,7 @@
1685 # Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
1686 # This file is distributed under the same license as the ubuntu-devices-help package.
1687 # FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
1688-#
1689+#
1690 msgid ""
1691 msgstr ""
1692 "Project-Id-Version: ubuntu-devices-help\n"
1693@@ -14,8 +14,8 @@
1694 "MIME-Version: 1.0\n"
1695 "Content-Type: text/plain; charset=UTF-8\n"
1696 "Content-Transfer-Encoding: 8bit\n"
1697+"X-Generator: Launchpad (build 17403)\n"
1698 "X-Launchpad-Export-Date: 2015-03-19 06:02+0000\n"
1699-"X-Generator: Launchpad (build 17403)\n"
1700
1701 #. type: Plain text
1702 #: content/pages/security.md:2
1703@@ -33,7 +33,7 @@
1704 #: content/pages/settings.md:6 content/pages/ui.md:6 content/pages/apps.md:7
1705 #: content/pages/scopes.md:6
1706 msgid "[TOC]"
1707-msgstr ""
1708+msgstr "[TOC]"
1709
1710 #. !!T
1711 #: content/pages/security.md:7
1712@@ -93,8 +93,8 @@
1713 #: content/pages/security.md:19
1714 #, no-wrap
1715 msgid ""
1716-"Why do I have to type my PIN when using File Manager & Terminal (not default "
1717-"apps)?"
1718+"Why do I have to type my PIN when using File Manager & Terminal (not default"
1719+" apps)?"
1720 msgstr ""
1721
1722 #. type: Plain text
1723@@ -120,12 +120,6 @@
1724 "settings* option."
1725 msgstr ""
1726
1727-#. !!T
1728-#: content/pages/security.md:25
1729-#, no-wrap
1730-msgid "I forgot my passworde/security code. How can I unlock the phone?"
1731-msgstr ""
1732-
1733 #. type: Plain text
1734 #: content/pages/security.md:26
1735 msgid "TBD"
1736@@ -152,9 +146,12 @@
1737 #: content/pages/basic.md:9
1738 msgid ""
1739 "The music app let's you play music copied to the device. In addition, "
1740-"[scopes]({filename}scopes.md) such as 7digital and Grooveshark can also play "
1741-"music."
1742+"[scopes]({filename}scopes.md) such as 7digital and Grooveshark can also play"
1743+" music."
1744 msgstr ""
1745+"The music app let's you play music copied to the device. In addition, "
1746+"[scopes]({filename}scopes.ro.md) such as 7digital and Grooveshark can also "
1747+"play music."
1748
1749 #. !!T
1750 #: content/pages/basic.md:10
1751@@ -165,8 +162,8 @@
1752 #. type: Plain text
1753 #: content/pages/basic.md:12
1754 msgid ""
1755-"The media player application will play videos copied to the device. You will "
1756-"also find applications like youtube that give you streaming options."
1757+"The media player application will play videos copied to the device. You will"
1758+" also find applications like youtube that give you streaming options."
1759 msgstr ""
1760
1761 #. !!T
1762@@ -204,8 +201,8 @@
1763 #. type: Plain text
1764 #: content/pages/basic.md:21
1765 msgid ""
1766-"If you've just taken a picture, you can see it easily by swiping to the left "
1767-"from the right edge inside the camera app. Alternatively, use the gallery "
1768+"If you've just taken a picture, you can see it easily by swiping to the left"
1769+" from the right edge inside the camera app. Alternatively, use the gallery "
1770 "app to find the picture."
1771 msgstr ""
1772
1773@@ -264,43 +261,37 @@
1774 #: content/pages/faq.md:6
1775 #, no-wrap
1776 msgid "[First day tasks]({filename}basic.md)"
1777-msgstr ""
1778+msgstr "[First day tasks]({filename}basic.ro.md)"
1779
1780 #. type: Title ###
1781 #: content/pages/faq.md:7
1782 #, no-wrap
1783 msgid "[User Interface]({filename}ui.md)"
1784-msgstr ""
1785+msgstr "[User Interface]({filename}ui.ro.md)"
1786
1787 #. type: Title ###
1788 #: content/pages/faq.md:8
1789 #, no-wrap
1790 msgid "[Settings]({filename}settings.md)"
1791-msgstr ""
1792+msgstr "[Settings]({filename}settings.ro.md)"
1793
1794 #. type: Title ###
1795 #: content/pages/faq.md:9
1796 #, no-wrap
1797-msgid "[The Store]({filename}store.md)"
1798-msgstr ""
1799+msgid "[Apps]({filename}apps.md)"
1800+msgstr "[Apps]({filename}apps.ro.md)"
1801
1802 #. type: Title ###
1803 #: content/pages/faq.md:10
1804 #, no-wrap
1805-msgid "[Apps]({filename}apps.md)"
1806-msgstr ""
1807+msgid "[Scopes]({filename}scopes.md)"
1808+msgstr "[Scopes]({filename}scopes.ro.md)"
1809
1810 #. type: Title ###
1811 #: content/pages/faq.md:11
1812 #, no-wrap
1813-msgid "[Scopes]({filename}scopes.md)"
1814-msgstr ""
1815-
1816-#. type: Title ###
1817-#: content/pages/faq.md:12
1818-#, no-wrap
1819 msgid "[Security]({filename}security.md)"
1820-msgstr ""
1821+msgstr "[Security]({filename}security.ro.md)"
1822
1823 #. type: Plain text
1824 #: content/pages/index.md:2
1825@@ -335,6 +326,8 @@
1826 "[Take me to the FAQ!]({filename}faq.md) [Get in touch]({filename}get-in-"
1827 "touch.md)"
1828 msgstr ""
1829+"[Take me to the FAQ!]({filename}faq.ro.md) [Get in touch]({filename}get-in-"
1830+"touch.md)"
1831
1832 #. type: Plain text
1833 #: content/pages/settings.md:2
1834@@ -411,8 +404,8 @@
1835 #. type: Plain text
1836 #: content/pages/settings.md:22
1837 msgid ""
1838-"You can set up some of your accounts from the scopes. Today scope allows you "
1839-"to configure your Google and Fitbit account, while the Pictures scope lets "
1840+"You can set up some of your accounts from the scopes. Today scope allows you"
1841+" to configure your Google and Fitbit account, while the Pictures scope lets "
1842 "you configure your flickr, Facebook and Instagram account. You can manage "
1843 "all your accounts (including social media, email, etc) from the *System "
1844 "Settings* app, under *Personal*, *Accounts*."
1845@@ -470,8 +463,8 @@
1846 #. type: Plain text
1847 #: content/pages/ui.md:9
1848 msgid ""
1849-"The dash contains a list of applications installed on the device, along with "
1850-"presenting the scopes and store. The dash is the first thing you see when "
1851+"The dash contains a list of applications installed on the device, along with"
1852+" presenting the scopes and store. The dash is the first thing you see when "
1853 "booting the phone. You can switch to it again at any time by swiping left "
1854 "from the right screen edge."
1855 msgstr ""
1856@@ -498,8 +491,8 @@
1857 #. type: Plain text
1858 #: content/pages/ui.md:15
1859 msgid ""
1860-"Indicators convey quick useful information about your device, like the time, "
1861-"data connection, location, sound, and notifications. You can access the "
1862+"Indicators convey quick useful information about your device, like the time,"
1863+" data connection, location, sound, and notifications. You can access the "
1864 "indicators at any time by swiping down from the top screen edge."
1865 msgstr ""
1866
1867@@ -528,10 +521,10 @@
1868 #. type: Plain text
1869 #: content/pages/ui.md:22
1870 msgid ""
1871-"To close an application, slide your finger *slowly* left from the right edge "
1872-"of the screen. An application switcher will appear. Place your finger on the "
1873-"application preview you wish to close and swipe up or down. The application "
1874-"will disappear."
1875+"To close an application, slide your finger *slowly* left from the right edge"
1876+" of the screen. An application switcher will appear. Place your finger on "
1877+"the application preview you wish to close and swipe up or down. The "
1878+"application will disappear."
1879 msgstr ""
1880
1881 #. !!T
1882@@ -543,8 +536,8 @@
1883 #. type: Plain text
1884 #: content/pages/ui.md:25
1885 msgid ""
1886-"For text that can be copied and pasted, press and hold the text in question. "
1887-"A menu will appear allowing you to cut, copy and paste."
1888+"For text that can be copied and pasted, press and hold the text in question."
1889+" A menu will appear allowing you to cut, copy and paste."
1890 msgstr ""
1891
1892 #. !!T
1893@@ -586,8 +579,8 @@
1894 #. type: Plain text
1895 #: content/pages/ui.md:33
1896 msgid ""
1897-"The round circle is the infographic. It hows you recent phone activity, like "
1898-"the number of messages received or the number of songs played."
1899+"The round circle is the infographic. It hows you recent phone activity, like"
1900+" the number of messages received or the number of songs played."
1901 msgstr ""
1902
1903 #. type: Plain text
1904@@ -625,8 +618,8 @@
1905 #: content/pages/apps.md:14
1906 msgid ""
1907 "From the Apps scope, you can either tap on the “search” icon on the right "
1908-"and start searching by name, or you can go all the way down in the scope and "
1909-"tap on the Ubuntu Store icon."
1910+"and start searching by name, or you can go all the way down in the scope and"
1911+" tap on the Ubuntu Store icon."
1912 msgstr ""
1913
1914 #. !!T
1915@@ -699,8 +692,8 @@
1916 #: content/pages/apps.md:34
1917 msgid ""
1918 "You can add music in multiple ways. If you have pre-existing music files, "
1919-"simply connect your phone to your pc via the usb cable. Next, copy the music "
1920-"you wish to listen to to the *Music* folder. Your music will appear in the "
1921+"simply connect your phone to your pc via the usb cable. Next, copy the music"
1922+" you wish to listen to to the *Music* folder. Your music will appear in the "
1923 "music app. Alternatively, you can acquire music directly using the device "
1924 "via a scope, such as grooveshark or by downloading via the browser or "
1925 "another application."
1926@@ -732,11 +725,11 @@
1927 #. type: Plain text
1928 #: content/pages/apps.md:42
1929 msgid ""
1930-"The first time you open the Contacts app you’ll be asked if you want to sync "
1931-"contacts with your Google account. If you have answered “no” but change your "
1932-"mind later, you can do so by going to the Today scope, and setting up your "
1933-"Google account there. After that you can sync your contacts (and, if you "
1934-"want, calendar events as well)."
1935+"The first time you open the Contacts app you’ll be asked if you want to sync"
1936+" contacts with your Google account. If you have answered “no” but change "
1937+"your mind later, you can do so by going to the Today scope, and setting up "
1938+"your Google account there. After that you can sync your contacts (and, if "
1939+"you want, calendar events as well)."
1940 msgstr ""
1941
1942 #. type: Title ##
1943@@ -771,8 +764,8 @@
1944 msgid ""
1945 "If you've just taken a video, share it easily by swiping to the left from "
1946 "the right edge inside the camera app. Alternatively, use the gallery app to "
1947-"find the video. Once loaded, select *Share* from the menu and choose how you "
1948-"wish to share your video."
1949+"find the video. Once loaded, select *Share* from the menu and choose how you"
1950+" wish to share your video."
1951 msgstr ""
1952
1953 #. type: Title ##
1954@@ -803,8 +796,8 @@
1955 #. type: Plain text
1956 #: content/pages/apps.md:60
1957 msgid ""
1958-"Use the gallery app to select your picture. Select the *Edit* button next to "
1959-"the menu. Inside you'll find options to crop and rotate your picture."
1960+"Use the gallery app to select your picture. Select the *Edit* button next to"
1961+" the menu. Inside you'll find options to crop and rotate your picture."
1962 msgstr ""
1963
1964 #. !!T
1965@@ -935,8 +928,8 @@
1966 #: content/pages/scopes.md:9
1967 msgid ""
1968 "Swipe up from the bottom edge of the dash to reveal a scopes manager. "
1969-"Favorite scopes you wish to appear on your dash by selecting them. Selecting "
1970-"them again will remove the favorite. All favorited scopes will appear on "
1971+"Favorite scopes you wish to appear on your dash by selecting them. Selecting"
1972+" them again will remove the favorite. All favorited scopes will appear on "
1973 "your dash."
1974 msgstr ""
1975
1976@@ -969,3 +962,15 @@
1977 "will remove it from your dash. If you'd like to remove it completely, visit "
1978 "the scope page in the ubuntu store and select *Uninstall*."
1979 msgstr ""
1980+
1981+#. !!T
1982+#: content/pages/security.md:25
1983+#, no-wrap
1984+msgid "I forgot my password or passcode. How can I unlock the phone?"
1985+msgstr ""
1986+
1987+#~ msgid "[The Store]({filename}store.md)"
1988+#~ msgstr ""
1989+
1990+#~ msgid "I forgot my passworde/security code. How can I unlock the phone?"
1991+#~ msgstr ""

Subscribers

People subscribed via source and target branches