BeatBox

Merge lp:~alexander-wilms/beat-box/fixes into lp:beat-box

  1. fixes
  2. Merge into trunk
Proposed by 982c80311320c1b
Status: Merged
Approved by: Scott Ringwelski
Approved revision: 464
Merged at revision: 463
Proposed branch: lp:~alexander-wilms/beat-box/fixes
Merge into: lp:beat-box
Diff against target: 251 lines (+50/-50)
2 files modified
po/de.po (+49/-49)
src/LibraryWindow.vala (+1/-1)
To merge this branch: bzr merge lp:~alexander-wilms/beat-box/fixes
Reviewer Review Type Date Requested Status
Scott Ringwelski Needs Information
Review via email: mp+89277@code.launchpad.net

Description of the change

Improves German Translation, fixes a typo in one of the English strings

To post a comment you must log in.
Revision history for this message
Scott Ringwelski (sgringwe) wrote :

Why are there absolute paths? (/home/xapantu/Dev/beat-box/)

review: Needs Information
Revision history for this message
982c80311320c1b (alexander-wilms) wrote :

> Why are there absolute paths? (/home/xapantu/Dev/beat-box/)

> I don't know, the version in trunk has them, too

Revision history for this message
Scott Ringwelski (sgringwe) wrote :

Well, for distributed code absolute paths are certainly not a good idea. Could you look into that and see why?

Also, chances are you will need to pull new changes to your branch before I can merge.

lp:~alexander-wilms/beat-box/fixes updated
462. By 982c80311320c1b

Added Email to po file

463. By 982c80311320c1b

Made path names relative

464. By 982c80311320c1b

Pulled from trunk

Revision history for this message
982c80311320c1b (alexander-wilms) wrote :

I hope it's OK now.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/de.po'
2--- po/de.po 2012-01-18 05:14:44 +0000
3+++ po/de.po 2012-01-19 22:35:26 +0000
4@@ -1,7 +1,7 @@
5 # German translation for beat-box
6 # Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
7 # This file is distributed under the same license as the beat-box package.
8-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
9+# Alexander Wilms <alexander.wilms@zoho.com>, 2012.
10 #
11 msgid ""
12 msgstr ""
13@@ -9,7 +9,7 @@
14 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
15 "POT-Creation-Date: 2012-01-17 20:24+0100\n"
16 "PO-Revision-Date: 2012-01-17 22:38+0000\n"
17-"Last-Translator: Alexander Wilms <Unknown>\n"
18+"Last-Translator: Alexander Wilms <alexander.wilms@zoho.com>\n"
19 "Language-Team: German <de@li.org>\n"
20 "MIME-Version: 1.0\n"
21 "Content-Type: text/plain; charset=UTF-8\n"
22@@ -17,169 +17,169 @@
23 "X-Launchpad-Export-Date: 2012-01-18 05:14+0000\n"
24 "X-Generator: Launchpad (build 14681)\n"
25
26-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:203
27+#: ../src//LibraryWindow.vala:203
28 msgid "Get Some Tunes."
29 msgstr "Holen Sie sich ein paar Songs."
30
31-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:203
32+#: ../src//LibraryWindow.vala:203
33 msgid "BeatBox can't seem to find your music."
34-msgstr "BeatBox scheint Ihre Musik nicht finden zu können."
35+msgstr "BeatBox scheint Ihre Musik nicht zu finden."
36
37-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:210
38+#: ../src//LibraryWindow.vala:210
39 msgid "Set Music Folder"
40 msgstr "Musikordner auswählen"
41
42-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:211
43+#: ../src//LibraryWindow.vala:211
44 msgid "Import to Library"
45 msgstr "In die Bibliothek importieren"
46
47-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:212
48+#: ../src//LibraryWindow.vala:212
49 msgid "Rescan Music Folder"
50 msgstr "Musikordner neu einlesen"
51
52-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:213
53+#: ../src//LibraryWindow.vala:213
54 msgid "Equalizer"
55 msgstr "Equalizer"
56
57-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:222
58+#: ../src//LibraryWindow.vala:222
59 msgid "Search..."
60-msgstr "Suchen…"
61+msgstr "Suchen..."
62
63-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:245
64+#: ../src//LibraryWindow.vala:245
65 msgid "Title"
66 msgstr "Titel"
67
68-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:246
69-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:296
70+#: ../src//LibraryWindow.vala:246
71+#: ../src//LibraryWindow.vala:296
72 #, c-format
73 msgid "Artist"
74 msgstr "Interpret"
75
76-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:246
77-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:295
78+#: ../src//LibraryWindow.vala:246
79+#: ../src//LibraryWindow.vala:295
80 msgid "Album"
81 msgstr "Album"
82
83-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:271
84+#: ../src//LibraryWindow.vala:271
85 msgid "Library"
86 msgstr "Bibliothek"
87
88-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:282
89+#: ../src//LibraryWindow.vala:282
90 msgid "Preferences"
91 msgstr "Einstellungen"
92
93-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:293
94-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:299
95+#: ../src//LibraryWindow.vala:293
96+#: ../src//LibraryWindow.vala:299
97 msgid "Off"
98 msgstr "Aus"
99
100-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:294
101+#: ../src//LibraryWindow.vala:294
102 msgid "Media"
103 msgstr "Medien"
104
105-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:297
106-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:300
107+#: ../src//LibraryWindow.vala:297
108+#: ../src//LibraryWindow.vala:300
109 msgid "All"
110 msgstr "Alle"
111
112-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:302
113+#: ../src//LibraryWindow.vala:302
114 msgid "Hide"
115 msgstr "Verbergen"
116
117-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:303
118+#: ../src//LibraryWindow.vala:303
119 msgid "Show"
120 msgstr "Anzeigen"
121
122-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:368
123+#: ../src//LibraryWindow.vala:368
124 msgid "Locate"
125 msgstr "Festlegen"
126
127-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:368
128+#: ../src//LibraryWindow.vala:368
129 msgid "Change your music folder."
130 msgstr "Ändern Sie Ihren Musikordner."
131
132-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:478
133+#: ../src//LibraryWindow.vala:478
134 msgid "Similar"
135 msgstr "Ähnliches"
136
137-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:482
138+#: ../src//LibraryWindow.vala:482
139 msgid "Queue"
140 msgstr "Warteschlange"
141
142-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:486
143+#: ../src//LibraryWindow.vala:486
144 msgid "History"
145 msgstr "Verlauf"
146
147-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:490
148+#: ../src//LibraryWindow.vala:490
149 msgid "Music"
150 msgstr "Musik"
151
152-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:494
153+#: ../src//LibraryWindow.vala:494
154 msgid "Podcasts"
155 msgstr "Podcasts"
156
157-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:498
158+#: ../src//LibraryWindow.vala:498
159 msgid "Internet Radio"
160 msgstr "Internetradio"
161
162-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:503
163+#: ../src//LibraryWindow.vala:503
164 msgid "Music Store"
165 msgstr "Music Store"
166
167-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:694
168+#: ../src//LibraryWindow.vala:694
169 msgid "Unknown Artist"
170 msgstr "Unbekannter Interpret"
171
172-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:694
173+#: ../src//LibraryWindow.vala:694
174 msgid " by "
175 msgstr " von "
176
177-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:695
178+#: ../src//LibraryWindow.vala:695
179 msgid "Unknown Album"
180 msgstr "Unbekanntes Album"
181
182-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:695
183+#: ../src//LibraryWindow.vala:695
184 msgid " on "
185 msgstr " auf "
186
187-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:1082
188+#: ../src//LibraryWindow.vala:1082
189 msgid "Import Music"
190 msgstr "Musik importieren"
191
192-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:1095
193+#: ../src//LibraryWindow.vala:1095
194 #, c-format
195 msgid "<b>Importing</b> music from <b>%s</b> to library."
196-msgstr "<b>Importiere</b> Musik aus <b>%s</b> in die Bibliothek"
197+msgstr "<b>Importiere</b> Musik aus <b>%s</b> in die Bibliothek."
198
199-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:1111
200+#: ../src//LibraryWindow.vala:1111
201 msgid "Rescanning music folder for changes"
202 msgstr "Überprüfe den Musikordner auf Veränderungen"
203
204-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:1118
205+#: ../src//LibraryWindow.vala:1118
206 msgid "Could not find Music Folder"
207 msgstr "Der Musikordner konnte nicht gefunden werden"
208
209-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:1118
210+#: ../src//LibraryWindow.vala:1118
211 msgid "Please make sure that your music folder is accessible and mounted."
212 msgstr ""
213 "Bitte stellen Sie sicher, dass Ihr Musikordner erreichbar und eingehängt ist."
214
215-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:1186
216+#: ../src//LibraryWindow.vala:1186
217 msgid "Import Complete"
218 msgstr "Import abgeschlossen"
219
220-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:1186
221+#: ../src//LibraryWindow.vala:1186
222 msgid "BeatBox has imported your library."
223 msgstr "BeatBox hat Ihre Bibliothek importiert."
224
225-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:1363
226+#: ../src//LibraryWindow.vala:1363
227 msgid "Choose Music Folder"
228 msgstr "Musikordner auswählen"
229
230-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:1561
231+#: ../src//LibraryWindow.vala:1561
232 msgid "Import songs from audio CD"
233 msgstr "Titel von einer Audio-CD importieren"
234
235-#: /home/xapantu/Dev/beat-box/translations/po/../src//LibraryWindow.vala:1561
236+#: ../src//LibraryWindow.vala:1561
237 msgid "Imort media from device"
238 msgstr "Medien von einem Gerät importieren"
239
240=== modified file 'src/LibraryWindow.vala'
241--- src/LibraryWindow.vala 2012-01-19 03:54:06 +0000
242+++ src/LibraryWindow.vala 2012-01-19 22:35:26 +0000
243@@ -1562,7 +1562,7 @@
244 /* device stuff for welcome screen */
245 public void device_added(Device d) {
246 // add option to import in welcome screen
247- string secondary = (d.getContentType() == "cdrom") ? _("Import songs from audio CD") : _("Imort media from device");
248+ string secondary = (d.getContentType() == "cdrom") ? _("Import songs from audio CD") : _("Import media from device");
249 int key = welcomeScreen.append_with_image( new Image.from_gicon(d.get_icon(), Gtk.IconSize.DIALOG), d.getDisplayName(), secondary);
250 welcome_screen_keys.set(key, d);
251 }

Subscribers

People subscribed via source and target branches