Merge lp:~csaba-kertesz/ubufox/lp509536 into lp:~asac/ubufox/main

Proposed by kecsap
Status: Merged
Merged at revision: not available
Proposed branch: lp:~csaba-kertesz/ubufox/lp509536
Merge into: lp:~asac/ubufox/main
Diff against target: 52 lines (+27/-0)
5 files modified
locale/nl-NL/ubufox-alt.dtd (+5/-0)
locale/nl-NL/ubufox-alt.properties (+1/-0)
locale/nl-NL/ubufox-restart.properties (+5/-0)
locale/nl-NL/ubufox.dtd (+4/-0)
locale/nl-NL/ubufox.properties (+12/-0)
To merge this branch: bzr merge lp:~csaba-kertesz/ubufox/lp509536
Reviewer Review Type Date Requested Status
Alexander Sack Pending
Review via email: mp+19620@code.launchpad.net
To post a comment you must log in.
Revision history for this message
kecsap (csaba-kertesz) wrote :

I modified some fields of the translation (only ellipses and urls) because it did not follow the other translations.

Revision history for this message
Alexander Sack (asac) wrote :

why do we have lp:~csaba-kertesz/ubufox/lp509536 and lp:~csaba-kertesz/ubufox/lp414926 ... both seem to add nl translations? which order should those be applied?

Revision history for this message
Alexander Sack (asac) wrote :

oh ok. you added nl here and bg there ... have you tried if it works well? e.g. is there no string missing?

Revision history for this message
kecsap (csaba-kertesz) wrote :

Yes, I checked every entry in the translation files and everything is ok/in place in this Dutch and the Bulgarian translation in the other merge request.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'locale/nl-NL'
2=== added file 'locale/nl-NL/ubufox-alt.dtd'
3--- locale/nl-NL/ubufox-alt.dtd 1970-01-01 00:00:00 +0000
4+++ locale/nl-NL/ubufox-alt.dtd 2010-02-18 15:35:19 +0000
5@@ -0,0 +1,5 @@
6+<!ENTITY ubufox.altplugin.title "Plug-ins voor inhoud beheren">
7+<!ENTITY ubufox.altplugin.filter.used "Plug-ins in gebruik">
8+<!ENTITY ubufox.altplugin.filter.all "Alle plug-ins">
9+<!ENTITY ubufox.altplugin.filtertitle "Weergeven:">
10+<!ENTITY ubufox.altplugin.menuentry "Plug-ins voor inhoud beheren">
11
12=== added file 'locale/nl-NL/ubufox-alt.properties'
13--- locale/nl-NL/ubufox-alt.properties 1970-01-01 00:00:00 +0000
14+++ locale/nl-NL/ubufox-alt.properties 2010-02-18 15:35:19 +0000
15@@ -0,0 +1,1 @@
16+ubufox.altplugins.search=Zoeken ...
17
18=== added file 'locale/nl-NL/ubufox-restart.properties'
19--- locale/nl-NL/ubufox-restart.properties 1970-01-01 00:00:00 +0000
20+++ locale/nl-NL/ubufox-restart.properties 2010-02-18 15:35:19 +0000
21@@ -0,0 +1,5 @@
22+
23+restartNotificationLabel=Uw browser is bijgewerkt en moet herstart worden.
24+restartNotificationButton=Herstarten
25+restartNotificationKey=r
26+
27
28=== added file 'locale/nl-NL/ubufox.dtd'
29--- locale/nl-NL/ubufox.dtd 1970-01-01 00:00:00 +0000
30+++ locale/nl-NL/ubufox.dtd 2010-02-18 15:35:19 +0000
31@@ -0,0 +1,4 @@
32+<!ENTITY ubufox.launchpad.reportbug.label "Een programmafout melden...">
33+<!ENTITY ubufox.launchpad.helptranslate.label "Dit programma vertalen...">
34+<!ENTITY ubufox.launchpad.gethelponline.label "Online hulp krijgen...">
35+<!ENTITY ubufox.getubuntuextension "Ubuntu-extensies verkrijgen">
36
37=== added file 'locale/nl-NL/ubufox.properties'
38--- locale/nl-NL/ubufox.properties 1970-01-01 00:00:00 +0000
39+++ locale/nl-NL/ubufox.properties 2010-02-18 15:35:19 +0000
40@@ -0,0 +1,12 @@
41+helloMessage=Hallo wereld!
42+helloMessageTitle=Hallo
43+prefMessage=Int Pref Value: %d
44+extensions.ubufox@ubuntu.com.description=Ubuntu Firefox-pakket.
45+ubufox.pluginWizard.availablePluginsPage.description.label=Kies een plug-in voor het mediatype
46+app.releaseNotesURL=http://www.ubuntu.com/getubuntu/releasenotes/1004
47+browser.startup.homepage=about:home
48+browser.throbber.url=file:///usr/share/ubuntu-artwork/home/locales/index-nl.html
49+app.update.url.details=file:///usr/share/ubuntu-artwork/home/locales/index-nl.html
50+startup.homepage_override_url=about:blank
51+startup.homepage_welcome_url=about:blank
52+ubufox.pluginWizard.description.notfound=Geen omschrijving gevonden in database. \nMeld een bug aan ubuntu-mozillateam@lists.ubuntu.com

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: