summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Brohet <therbom@gmail.com>2013-01-16 05:33:13 -0800
committerGerrit Code Review <gerrit@review.cyanogenmod.com>2013-01-16 05:33:13 -0800
commitdbd6f4fac9d393331a2e49bfbec80fe7b654d779 (patch)
tree283ca475b71e86b582024af8e2750d5aea4d1b79
parent65de4056e4b73a8b086faa45f3848bfd5c60bd83 (diff)
parentb39d3c8fe53285904c564b9ef947309c03d6f7ec (diff)
downloadframeworks_base-dbd6f4fac9d393331a2e49bfbec80fe7b654d779.zip
frameworks_base-dbd6f4fac9d393331a2e49bfbec80fe7b654d779.tar.gz
frameworks_base-dbd6f4fac9d393331a2e49bfbec80fe7b654d779.tar.bz2
Merge "Update Russian Translation-SystemUI-CM10.1" into cm-10.1
-rw-r--r--packages/SystemUI/res/values-ru/strings.xml24
1 files changed, 14 insertions, 10 deletions
diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml
index f50e55a..332abb9 100644
--- a/packages/SystemUI/res/values-ru/strings.xml
+++ b/packages/SystemUI/res/values-ru/strings.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?>
+<!--
/**
* Copyright (c) 2009, 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
+ * 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
+ * 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
+ * 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.
*/
-->
@@ -224,6 +224,10 @@
<string name="quick_settings_report_bug">Отчёт об ошибке</string>
<string name="quick_settings_sync">Синхронизация</string>
<string name="quick_settings_torch">Фонарь</string>
+ <string name="quick_settings_screen_timeout">Тайм-аут</string>
+ <string name="quick_settings_usb_tether_off_label">Отключено</string>
+ <string name="quick_settings_usb_tether_connected_label">Выключен</string>
+ <string name="quick_settings_usb_tether_on_label">Включен</string>
<!-- Dialog title for navigation bar button selection -->
<string name="navbar_dialog_title">Выберите действие</string>