Permalink
Browse files

HUE-765 [admin] Integrating i18n

Removing automatic building of po files
Resoving conflicts
  • Loading branch information...
1 parent 20be268 commit 4120375964a188403e06ae5ee9ce1496dd4b7afc @romainr romainr committed Jul 3, 2012
View
@@ -20,7 +20,7 @@ endif
APP_NAME = shell
include $(ROOT)/Makefile.sdk
-compile: setuid compile-locale
+compile: setuid
clean:: remove_setuid
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-07-03 14:28-0700\n"
+"POT-Creation-Date: 2012-07-03 15:25-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-07-03 14:28-0700\n"
+"POT-Creation-Date: 2012-07-03 15:25-0700\n"
"PO-Revision-Date: 2012-07-03 12:23-0700\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: fr <LL@li.org>\n"
View
@@ -20,5 +20,5 @@ ifeq ($(ROOT),)
$(error "Error: Expect the environment variable $$ROOT to point to the Desktop installation")
endif
-APP_NAME = hue-useradmin
+APP_NAME = useradmin
include $(ROOT)/Makefile.sdk
@@ -1,275 +0,0 @@
-# Translations template for PROJECT.
-# Copyright (C) 2012 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-06-30 02:12+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
-
-#: src/useradmin/templates/confirm.mako:22
-msgid "Confirm"
-msgstr ""
-
-#: src/useradmin/templates/confirm.mako:25
-#: src/useradmin/templates/list_groups.mako:81
-#: src/useradmin/templates/list_users.mako:110
-msgid "Yes"
-msgstr ""
-
-#: src/useradmin/templates/edit_group.mako:26
-#: src/useradmin/templates/list_groups.mako:24
-#: src/useradmin/templates/list_groups.mako:28
-msgid "Hue Groups"
-msgstr ""
-
-#: src/useradmin/templates/edit_group.mako:48
-#, python-format
-msgid "Hue Groups - Edit group: %(name)s"
-msgstr ""
-
-#: src/useradmin/templates/edit_group.mako:53
-msgid "Hue Groups - Add/sync LDAP group"
-msgstr ""
-
-#: src/useradmin/templates/edit_group.mako:55
-msgid "Hue Groups - Create group"
-msgstr ""
-
-#: src/useradmin/templates/edit_group.mako:68
-msgid "Update group"
-msgstr ""
-
-#: src/useradmin/templates/edit_group.mako:71
-msgid "Add/Sync group"
-msgstr ""
-
-#: src/useradmin/templates/edit_group.mako:73
-#: src/useradmin/templates/list_groups.mako:32
-msgid "Add group"
-msgstr ""
-
-#: src/useradmin/templates/edit_group.mako:76
-#: src/useradmin/templates/edit_permissions.mako:56
-#: src/useradmin/templates/edit_user.mako:73
-#: src/useradmin/templates/list_users.mako:97
-msgid "Cancel"
-msgstr ""
-
-#: src/useradmin/templates/edit_group.mako:84
-#: src/useradmin/templates/edit_group.mako:89
-#: src/useradmin/templates/edit_permissions.mako:65
-#: src/useradmin/templates/edit_user.mako:80
-msgid "Select all"
-msgstr ""
-
-#: src/useradmin/templates/edit_group.mako:85
-#: src/useradmin/templates/edit_group.mako:90
-#: src/useradmin/templates/edit_permissions.mako:66
-#: src/useradmin/templates/edit_user.mako:81
-msgid "Search"
-msgstr ""
-
-#: src/useradmin/templates/edit_permissions.mako:23
-#: src/useradmin/templates/list_permissions.mako:25
-#: src/useradmin/templates/list_permissions.mako:29
-msgid "Hue Permissions"
-msgstr ""
-
-#: src/useradmin/templates/edit_permissions.mako:44
-#, python-format
-msgid "Hue Permissions - Edit app: %(app)s"
-msgstr ""
-
-#: src/useradmin/templates/edit_permissions.mako:55
-msgid "Update permission"
-msgstr ""
-
-#: src/useradmin/templates/edit_user.mako:24
-#: src/useradmin/templates/list_users.mako:24
-#: src/useradmin/templates/list_users.mako:28
-msgid "Hue Users"
-msgstr ""
-
-#: src/useradmin/templates/edit_user.mako:45
-#, python-format
-msgid "Hue Users - Edit user: %(username)s"
-msgstr ""
-
-#: src/useradmin/templates/edit_user.mako:50
-msgid "Hue Users - Add/sync LDAP user"
-msgstr ""
-
-#: src/useradmin/templates/edit_user.mako:52
-msgid "Hue Users - Create user"
-msgstr ""
-
-#: src/useradmin/templates/edit_user.mako:65
-msgid "Update user"
-msgstr ""
-
-#: src/useradmin/templates/edit_user.mako:68
-msgid "Add/Sync user"
-msgstr ""
-
-#: src/useradmin/templates/edit_user.mako:70
-#: src/useradmin/templates/list_users.mako:32
-msgid "Add user"
-msgstr ""
-
-#: src/useradmin/templates/layout.mako:32
-msgid "Users"
-msgstr ""
-
-#: src/useradmin/templates/layout.mako:33
-#: src/useradmin/templates/list_permissions.mako:40
-#: src/useradmin/templates/list_users.mako:48
-msgid "Groups"
-msgstr ""
-
-#: src/useradmin/templates/layout.mako:34
-#: src/useradmin/templates/list_groups.mako:45
-msgid "Permissions"
-msgstr ""
-
-#: src/useradmin/templates/list_groups.mako:33
-msgid "Add/Sync LDAP group"
-msgstr ""
-
-#: src/useradmin/templates/list_groups.mako:37
-#: src/useradmin/templates/list_permissions.mako:32
-#: src/useradmin/templates/list_users.mako:38
-msgid "Filter: "
-msgstr ""
-
-#: src/useradmin/templates/list_groups.mako:37
-msgid "Search for group name, members, etc..."
-msgstr ""
-
-#: src/useradmin/templates/list_groups.mako:43
-msgid "Group Name"
-msgstr ""
-
-#: src/useradmin/templates/list_groups.mako:44
-msgid "Members"
-msgstr ""
-
-#: src/useradmin/templates/list_groups.mako:60
-#, python-format
-msgid "Edit %(groupname)s"
-msgstr ""
-
-#: src/useradmin/templates/list_groups.mako:61
-#, python-format
-msgid "Delete %(groupname)s"
-msgstr ""
-
-#: src/useradmin/templates/list_groups.mako:63
-#: src/useradmin/templates/list_permissions.mako:54
-#: src/useradmin/templates/list_users.mako:68
-msgid "Edit"
-msgstr ""
-
-#: src/useradmin/templates/list_groups.mako:64
-#: src/useradmin/templates/list_users.mako:69
-msgid "Delete"
-msgstr ""
-
-#: src/useradmin/templates/list_groups.mako:78
-#: src/useradmin/templates/list_users.mako:107
-msgid "Confirm action"
-msgstr ""
-
-#: src/useradmin/templates/list_groups.mako:82
-#: src/useradmin/templates/list_users.mako:111
-msgid "No"
-msgstr ""
-
-#: src/useradmin/templates/list_permissions.mako:32
-msgid "Search for application name, description, etc..."
-msgstr ""
-
-#: src/useradmin/templates/list_permissions.mako:38
-msgid "Application"
-msgstr ""
-
-#: src/useradmin/templates/list_permissions.mako:39
-msgid "Permission"
-msgstr ""
-
-#: src/useradmin/templates/list_permissions.mako:54
-msgid "Edit permission"
-msgstr ""
-
-#: src/useradmin/templates/list_users.mako:33
-msgid "Add/sync LDAP user"
-msgstr ""
-
-#: src/useradmin/templates/list_users.mako:34
-msgid "Sync LDAP users/groups"
-msgstr ""
-
-#: src/useradmin/templates/list_users.mako:38
-msgid "Search for username, name, e-mail, etc..."
-msgstr ""
-
-#: src/useradmin/templates/list_users.mako:44
-msgid "Username"
-msgstr ""
-
-#: src/useradmin/templates/list_users.mako:45
-msgid "First Name"
-msgstr ""
-
-#: src/useradmin/templates/list_users.mako:46
-msgid "Last Name"
-msgstr ""
-
-#: src/useradmin/templates/list_users.mako:47
-msgid "E-mail"
-msgstr ""
-
-#: src/useradmin/templates/list_users.mako:49
-msgid "Last Login"
-msgstr ""
-
-#: src/useradmin/templates/list_users.mako:64
-#, python-format
-msgid "Edit %(username)s"
-msgstr ""
-
-#: src/useradmin/templates/list_users.mako:65
-#, python-format
-msgid "Delete %(username)s"
-msgstr ""
-
-#: src/useradmin/templates/list_users.mako:86
-msgid "Sync LDAP users and groups"
-msgstr ""
-
-#: src/useradmin/templates/list_users.mako:90
-msgid ""
-"This will not import any users or groups that don't already exist in Hue."
-" Only users and groups imported from LDAP can be synced."
-msgstr ""
-
-#: src/useradmin/templates/list_users.mako:92
-msgid ""
-"All user information and group memberships will be updated based on the "
-"LDAP server's current state."
-msgstr ""
-
-#: src/useradmin/templates/list_users.mako:98
-msgid "Sync"
-msgstr ""
-
Oops, something went wrong.

0 comments on commit 4120375

Please sign in to comment.