Name cleanup

2015-09-15 17:41:07 +02:00 · 2015-09-15 17:41:07 +02:00 · 8527008e6e
parent 643bd7dd22
commit 8527008e6e
43 changed files with 89 additions and 89 deletions
--- a/Android.mk
+++ b/Android.mk
@ -1,4 +1,4 @@
-# Copyright (c) 2014 μg Project
+# Copyright (c) 2013-2015 microG Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
--- a/README.md
+++ b/README.md
@ -83,7 +83,7 @@ Some components: Copyright (C) 2013 The Android Open Source Project

 License
 -------
-    Copyright 2014 μg Project Team
+    Copyright 2013-2015 microG Project Team

    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
--- a/extern/UnifiedNlpApi
+++ b/extern/UnifiedNlpApi
@ -1 +1 @@
-Subproject commit 8b2a8eb21488fea4df0273ef9f369ac5f764bad2
+Subproject commit 236ef064e1293664f4a7dee9fbd0365ee6787ae7
--- a/unifiednlp-app/build.gradle
+++ b/unifiednlp-app/build.gradle
@ -1,17 +1,17 @@
 /*
- Copyright 2013-2015 µg Project Team
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ * Copyright 2013-2015 microG Project Team
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
 */

 buildscript {
@ -26,8 +26,8 @@ buildscript {
 apply plugin: 'com.android.application'

 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"

    productFlavors {
        NetworkLocation {
--- a/unifiednlp-app/src/main/AndroidManifest.xml
+++ b/unifiednlp-app/src/main/AndroidManifest.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2015 µg Project Team
+  ~ Copyright 2013-2015 microG Project Team
  ~
  ~ Licensed under the Apache License, Version 2.0 (the "License");
  ~ you may not use this file except in compliance with the License.
--- a/unifiednlp-app/src/main/java/org/microg/nlp/ui/SettingsLauncherActivity.java
+++ b/unifiednlp-app/src/main/java/org/microg/nlp/ui/SettingsLauncherActivity.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/unifiednlp-base/build.gradle
+++ b/unifiednlp-base/build.gradle
@ -1,17 +1,17 @@
 /*
- Copyright 2013-2015 µg Project Team
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ * Copyright 2013-2015 microG Project Team
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
 */

 buildscript {
@ -26,16 +26,16 @@ buildscript {
 apply plugin: 'com.android.library'

 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
    compileOptions {
        sourceCompatibility JavaVersion.VERSION_1_6
    }
 }

 dependencies {
-    compile 'com.android.support:support-v4:22.2.0'
-    compile 'com.android.support:appcompat-v7:22.2.0'
+    compile 'com.android.support:support-v4:23.0.1'
+    compile 'com.android.support:appcompat-v7:23.0.1'
    compile project(':unifiednlp-api')
    provided project(':unifiednlp-compat')
 }
--- a/unifiednlp-base/src/main/AndroidManifest.xml
+++ b/unifiednlp-base/src/main/AndroidManifest.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2015 µg Project Team
+  ~ Copyright 2013-2015 microG Project Team
  ~
  ~ Licensed under the Apache License, Version 2.0 (the "License");
  ~ you may not use this file except in compliance with the License.
--- a/unifiednlp-base/src/main/java/org/microg/nlp/AbstractBackendHelper.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/AbstractBackendHelper.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/unifiednlp-base/src/main/java/org/microg/nlp/AbstractProviderService.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/AbstractProviderService.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/unifiednlp-base/src/main/java/org/microg/nlp/PackageReceiver.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/PackageReceiver.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/unifiednlp-base/src/main/java/org/microg/nlp/Preferences.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/Preferences.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/unifiednlp-base/src/main/java/org/microg/nlp/Provider.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/Provider.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/unifiednlp-base/src/main/java/org/microg/nlp/geocode/AbstractGeocodeService.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/geocode/AbstractGeocodeService.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/unifiednlp-base/src/main/java/org/microg/nlp/geocode/BackendFuser.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/geocode/BackendFuser.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/unifiednlp-base/src/main/java/org/microg/nlp/geocode/BackendHelper.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/geocode/BackendHelper.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/unifiednlp-base/src/main/java/org/microg/nlp/geocode/GeocodeProvider.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/geocode/GeocodeProvider.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/unifiednlp-base/src/main/java/org/microg/nlp/geocode/GeocodeProviderV1.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/geocode/GeocodeProviderV1.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/unifiednlp-base/src/main/java/org/microg/nlp/geocode/GeocodeServiceV1.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/geocode/GeocodeServiceV1.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/unifiednlp-base/src/main/java/org/microg/nlp/location/AbstractLocationService.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/location/AbstractLocationService.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/unifiednlp-base/src/main/java/org/microg/nlp/location/BackendFuser.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/location/BackendFuser.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/unifiednlp-base/src/main/java/org/microg/nlp/location/BackendHelper.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/location/BackendHelper.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/unifiednlp-base/src/main/java/org/microg/nlp/location/LocationProvider.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/location/LocationProvider.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/unifiednlp-base/src/main/java/org/microg/nlp/location/LocationProviderV1.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/location/LocationProviderV1.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/unifiednlp-base/src/main/java/org/microg/nlp/location/LocationProviderV2.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/location/LocationProviderV2.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/unifiednlp-base/src/main/java/org/microg/nlp/location/LocationServiceV1.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/location/LocationServiceV1.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/unifiednlp-base/src/main/java/org/microg/nlp/location/LocationServiceV2.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/location/LocationServiceV2.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/unifiednlp-base/src/main/java/org/microg/nlp/location/ThreadHelper.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/location/ThreadHelper.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/unifiednlp-base/src/main/java/org/microg/nlp/ui/AbstractBackendPreference.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/ui/AbstractBackendPreference.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/unifiednlp-base/src/main/java/org/microg/nlp/ui/GeocoderBackendPreference.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/ui/GeocoderBackendPreference.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/unifiednlp-base/src/main/java/org/microg/nlp/ui/LocationBackendPreference.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/ui/LocationBackendPreference.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/unifiednlp-base/src/main/java/org/microg/nlp/ui/SettingInjectorService.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/ui/SettingInjectorService.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/unifiednlp-base/src/main/java/org/microg/nlp/ui/SettingsActivity.java
+++ b/unifiednlp-base/src/main/java/org/microg/nlp/ui/SettingsActivity.java
@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/unifiednlp-base/src/main/res/layout/backend_list_entry.xml
+++ b/unifiednlp-base/src/main/res/layout/backend_list_entry.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

 <!--
-  ~ Copyright 2013-2015 µg Project Team
+  ~ Copyright 2013-2015 microG Project Team
  ~
  ~ Licensed under the Apache License, Version 2.0 (the "License");
  ~ you may not use this file except in compliance with the License.
--- a/unifiednlp-base/src/main/res/layout/settings_activity.xml
+++ b/unifiednlp-base/src/main/res/layout/settings_activity.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2015 µg Project Team
+  ~ Copyright 2013-2015 microG Project Team
  ~
  ~ Licensed under the Apache License, Version 2.0 (the "License");
  ~ you may not use this file except in compliance with the License.
--- a/unifiednlp-base/src/main/res/layout/toolbar.xml
+++ b/unifiednlp-base/src/main/res/layout/toolbar.xml
@ -1,5 +1,5 @@
 <!--
-  ~ Copyright 2013-2015 µg Project Team
+  ~ Copyright 2013-2015 microG Project Team
  ~
  ~ Licensed under the Apache License, Version 2.0 (the "License");
  ~ you may not use this file except in compliance with the License.
--- a/unifiednlp-base/src/main/res/values-sr/strings.xml
+++ b/unifiednlp-base/src/main/res/values-sr/strings.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2015 µg Project Team
+  ~ Copyright 2013-2015 microG Project Team
  ~
  ~ Licensed under the Apache License, Version 2.0 (the "License");
  ~ you may not use this file except in compliance with the License.
@ -15,8 +15,8 @@
  -->

 <resources>
-    <string name="nlp_app_name">µg ОбједињениNlp</string>
-    <string name="nlp_settings_label">µg ОбједињениNlp поставке</string>
+    <string name="nlp_app_name">ОбједињениNlp</string>
+    <string name="nlp_settings_label">ОбједињениNlp поставке</string>
    <string name="add_backend">Додај мотор</string>
    <string name="configure_location_backends">Поставке мотора за локацију</string>
    <string name="configure_geocoder_backends">Поставке мотора за потрагу адреса</string>
--- a/unifiednlp-base/src/main/res/values/colors.xml
+++ b/unifiednlp-base/src/main/res/values/colors.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2015 µg Project Team
+  ~ Copyright 2013-2015 microG Project Team
  ~
  ~ Licensed under the Apache License, Version 2.0 (the "License");
  ~ you may not use this file except in compliance with the License.
--- a/unifiednlp-base/src/main/res/values/strings.xml
+++ b/unifiednlp-base/src/main/res/values/strings.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2015 µg Project Team
+  ~ Copyright 2013-2015 microG Project Team
  ~
  ~ Licensed under the Apache License, Version 2.0 (the "License");
  ~ you may not use this file except in compliance with the License.
@ -15,8 +15,8 @@
  -->

 <resources>
-    <string name="nlp_app_name">µg UnifiedNlp</string>
-    <string name="nlp_settings_label">µg UnifiedNlp Settings</string>
+    <string name="nlp_app_name">UnifiedNlp</string>
+    <string name="nlp_settings_label">UnifiedNlp Settings</string>
    <string name="add_backend">Add backend</string>
    <string name="configure_location_backends">Configure location backends</string>
    <string name="configure_geocoder_backends">Configure address lookup backends</string>
--- a/unifiednlp-base/src/main/res/values/themes.xml
+++ b/unifiednlp-base/src/main/res/values/themes.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2015 µg Project Team
+  ~ Copyright 2013-2015 microG Project Team
  ~
  ~ Licensed under the Apache License, Version 2.0 (the "License");
  ~ you may not use this file except in compliance with the License.
--- a/unifiednlp-base/src/main/res/xml/nlp_injected_setting.xml
+++ b/unifiednlp-base/src/main/res/xml/nlp_injected_setting.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2015 µg Project Team
+  ~ Copyright 2013-2015 microG Project Team
  ~
  ~ Licensed under the Apache License, Version 2.0 (the "License");
  ~ you may not use this file except in compliance with the License.
--- a/unifiednlp-base/src/main/res/xml/nlp_preferences.xml
+++ b/unifiednlp-base/src/main/res/xml/nlp_preferences.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2013-2015 µg Project Team
+  ~ Copyright 2013-2015 microG Project Team
  ~
  ~ Licensed under the Apache License, Version 2.0 (the "License");
  ~ you may not use this file except in compliance with the License.
--- a/unifiednlp-compat/build.gradle
+++ b/unifiednlp-compat/build.gradle
@ -1,17 +1,17 @@
 /*
- Copyright 2013-2015 µg Project Team
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ * Copyright 2013-2015 microG Project Team
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
 */

 apply plugin: 'java'