diff options
| author | Paul Westbrook <pwestbro@google.com> | 2013-02-15 10:49:18 -0800 |
|---|---|---|
| committer | Paul Westbrook <pwestbro@google.com> | 2013-02-15 10:49:18 -0800 |
| commit | 1a76449a643ab1e544da54514cf09f6f17f4d075 (patch) | |
| tree | 2615a977c52d7a479001ed451a58aa484dbe75e0 /photoviewer/res/values-sl/strings.xml | |
| parent | 9f1ab148925b098cec90d06992ade0fca2889a14 (diff) | |
| parent | e032f315b6f95896ff471e92a20a42159d53fa6a (diff) | |
| download | android_frameworks_ex-1a76449a643ab1e544da54514cf09f6f17f4d075.tar.gz android_frameworks_ex-1a76449a643ab1e544da54514cf09f6f17f4d075.tar.bz2 android_frameworks_ex-1a76449a643ab1e544da54514cf09f6f17f4d075.zip | |
Merge branch 'goog/jb-ub-mail-ur8' into master
Conflicts:
photoviewer/AndroidManifest.xml
photoviewer/res/values/dimen.xml
photoviewer/src/com/android/ex/photo/Intents.java
photoviewer/src/com/android/ex/photo/PhotoViewActivity.java
photoviewer/src/com/android/ex/photo/adapters/BaseCursorPagerAdapter.java
photoviewer/src/com/android/ex/photo/adapters/BaseFragmentPagerAdapter.java
photoviewer/src/com/android/ex/photo/adapters/PhotoPagerAdapter.java
photoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java
photoviewer/src/com/android/ex/photo/provider/PhotoContract.java
photoviewer/src/com/android/ex/photo/util/ImageUtils.java
photoviewer/src/com/android/ex/photo/views/PhotoView.java
Change-Id: Icb06b228f0eab1f828a21507ec2fbe7ede998536
Diffstat (limited to 'photoviewer/res/values-sl/strings.xml')
| -rw-r--r-- | photoviewer/res/values-sl/strings.xml | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/photoviewer/res/values-sl/strings.xml b/photoviewer/res/values-sl/strings.xml deleted file mode 100644 index 816b946..0000000 --- a/photoviewer/res/values-sl/strings.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright (C) 2012 Google Inc. - Licensed to The Android Open Source Project. - - 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. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="photo_view_count" msgid="3466690572899800275">"<xliff:g id="CURRENT_POS">%d</xliff:g> od <xliff:g id="COUNT">%d</xliff:g>"</string> - <string name="retry" msgid="3319517143224679074">"Znova"</string> -</resources> |