Oxide

Merge lp:~osomon/oxide/camera-names-i18n into lp:~oxide-developers/oxide/oxide.trunk

  1. camera-names-i18n
  2. Merge into oxide.trunk
Proposed by Olivier Tilloy
Status: Merged
Merged at revision: 1460
Proposed branch: lp:~osomon/oxide/camera-names-i18n
Merge into: lp:~oxide-developers/oxide/oxide.trunk
Diff against target: 66 lines (+14/-5)
2 files modified
po/oxide-qt.pot (+10/-2)
shared/browser/media/oxide_video_capture_device_factory_linux.cc (+4/-3)
To merge this branch: bzr merge lp:~osomon/oxide/camera-names-i18n
Reviewer Review Type Date Requested Status
Chris Coulson Approve
Review via email: mp+293294@code.launchpad.net

Commit message

Internationalize the user-facing strings for the names of the cameras.

To post a comment you must log in.
Revision history for this message
Chris Coulson (chrisccoulson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/oxide-qt.pot'
2--- po/oxide-qt.pot 2016-04-25 15:42:07 +0000
3+++ po/oxide-qt.pot 2016-04-28 15:58:23 +0000
4@@ -1,6 +1,6 @@
5 # SOME DESCRIPTIVE TITLE.
6 # Copyright (C) YEAR Canonical Ltd.
7-# This file is distributed under the same license as the PACKAGE package.
8+# This file is distributed under the same license as the oxide-qt package.
9 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
10 #
11 #, fuzzy
12@@ -8,7 +8,7 @@
13 msgstr ""
14 "Project-Id-Version: oxide-qt\n"
15 "Report-Msgid-Bugs-To: \n"
16-"POT-Creation-Date: 2016-04-25 16:39+0100\n"
17+"POT-Creation-Date: 2016-04-28 17:50+0200\n"
18 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
19 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
20 "Language-Team: LANGUAGE <LL@li.org>\n"
21@@ -21,6 +21,14 @@
22 msgid "Changes you made may not be saved."
23 msgstr ""
24
25+#: shared/browser/media/oxide_video_capture_device_factory_linux.cc:51
26+msgid "Rear camera"
27+msgstr ""
28+
29+#: shared/browser/media/oxide_video_capture_device_factory_linux.cc:53
30+msgid "Front camera"
31+msgstr ""
32+
33 #: shared/browser/oxide_user_agent_settings.cc:100
34 msgid "AcceptLanguage"
35 msgstr ""
36
37=== modified file 'shared/browser/media/oxide_video_capture_device_factory_linux.cc'
38--- shared/browser/media/oxide_video_capture_device_factory_linux.cc 2016-04-20 22:09:41 +0000
39+++ shared/browser/media/oxide_video_capture_device_factory_linux.cc 2016-04-28 15:58:23 +0000
40@@ -1,5 +1,5 @@
41 // vim:expandtab:shiftwidth=2:tabstop=2:
42-// Copyright (C) 2015 Canonical Ltd.
43+// Copyright (C) 2015-2016 Canonical Ltd.
44
45 // This library is free software; you can redistribute it and/or
46 // modify it under the terms of the GNU Lesser General Public
47@@ -18,6 +18,7 @@
48
49 #include "oxide_video_capture_device_factory_linux.h"
50
51+#include <libintl.h>
52 #include <utility>
53
54 #include "base/logging.h"
55@@ -47,9 +48,9 @@
56 const char* GetDeviceNameFromCameraType(CameraType type) {
57 switch (type) {
58 case BACK_FACING_CAMERA_TYPE:
59- return "Rear camera";
60+ return dgettext(OXIDE_GETTEXT_DOMAIN, "Rear camera");
61 case FRONT_FACING_CAMERA_TYPE:
62- return "Front camera";
63+ return dgettext(OXIDE_GETTEXT_DOMAIN, "Front camera");
64 }
65
66 NOTREACHED();

Subscribers

People subscribed via source and target branches