Ubuntu Settings Components

Merge lp://qastaging/~jonas-drange/ubuntu-settings-components/prune-vpn-translations into lp://qastaging/~registry/ubuntu-settings-components/trunk

  1. prune-vpn-translations
  2. Merge into trunk
Proposed by Jonas G. Drange
Status: Merged
Approved by: Nick Dedekind
Approved revision: 119
Merged at revision: 119
Proposed branch: lp://qastaging/~jonas-drange/ubuntu-settings-components/prune-vpn-translations
Merge into: lp://qastaging/~registry/ubuntu-settings-components/trunk
Diff against target: 430 lines (+344/-24)
3 files modified
plugins/Ubuntu/Settings/Vpn/Openvpn/Editor.qml (+20/-20)
plugins/Ubuntu/Settings/Vpn/VpnTypeField.qml (+2/-2)
po/ubuntu-settings-components.pot (+322/-2)
To merge this branch: bzr merge lp://qastaging/~jonas-drange/ubuntu-settings-components/prune-vpn-translations
Reviewer Review Type Date Requested Status
Nick Dedekind (community) Approve
Review via email: mp+289518@code.qastaging.launchpad.net

Commit message

prune vpn's translated strings like cipher options, "0" and "1", and update the .pot file

To post a comment you must log in.
lp://qastaging/~jonas-drange/ubuntu-settings-components/prune-vpn-translations updated
118. By Jonas G. Drange

update pot file

Revision history for this message
Nick Dedekind (nick-dedekind) wrote :

I don't think the protocol acronyms should be translated.

UDP
TCP

And the value types:
OpenVPN
Pptp

VPN “%1”
VPN

review: Needs Fixing
lp://qastaging/~jonas-drange/ubuntu-settings-components/prune-vpn-translations updated
119. By Jonas G. Drange

remove type and protocols

Revision history for this message
Jonas G. Drange (jonas-drange) wrote :

Removed localization of OpenVPN/Pptp and TCP/UPD. I've kept the localization for “VPN” because we can't assume “VPN” is the label for a virtual private network in all languages. As an example to justify this: APN, which is the same type of abbreviation as VPN, is not APN in Norwegian, but rather “Internett-tilknytningspunkt”.

Revision history for this message
Nick Dedekind (nick-dedekind) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: