on xenial help sign in
merge trunk.
commit1d934f8e9d26ed812f11b4ab88a2a81310167705 authorAntti Kaijanmäki <antti.kaijanmaki@canonical.com> dateTue 7 Oct 2014, 11:19 (12 years ago) parent372001648f22f3
353 files changed+17153−9468
CMakeLists.txt+2−2 CODING+4 build.sh+1 cmake/modules/QmlTest.cmake+25−4 data/unity8-dash.desktop.in+3−3 data/unity8-filewatcher.conf+8 data/unity8.conf+5−1 data/unity8.desktop.in+1−1 debian/changelog+263 debian/control+12−10 debian/unity8-private.install+1 debian/unity8.install+1 plugins/AccountsService/AccountsService.cpp+38 plugins/AccountsService/AccountsService.h+14 plugins/AccountsService/AccountsService.qmltypes+1 plugins/Dash/CardAttributes.qml+1−1 plugins/Dash/CardCreator.js+19−20 plugins/Dash/CroppedImageMinimumSourceSize.qml+38 plugins/Dash/listviewwithpageheader.cpp+36−12 plugins/Dash/listviewwithpageheader.h+9−1 plugins/Dash/qmldir+2−1 plugins/LightDM/DBusGreeter.cpp+5 plugins/LightDM/DBusGreeter.h+1−1 plugins/LightDM/DBusGreeterList.h−1 plugins/LightDM/Greeter.h+1 plugins/LightDM/LightDM.qmltypes+2 plugins/Lights/Lights.cpp+1−2 plugins/Lights/android-hardware.h+23 plugins/Powerd/Powerd.cpp+16−2 plugins/Powerd/Powerd.h+8−1 plugins/Powerd/Powerd.qmltypes+3−3 plugins/Ubuntu/Payments/Payments.cpp+21−1 plugins/Ubuntu/Payments/Payments.h+4 plugins/Ubuntu/SystemImage/SystemImage.qmltypes+2 plugins/Unity/DashCommunicator/CMakeLists.txt+8−2 plugins/Unity/DashCommunicator/dashcommunicator.cpp+22−13 plugins/Unity/DashCommunicator/dashcommunicator.h+17−7 plugins/Unity/DashCommunicator/dashcommunicatorservice.h+1−1 plugins/Unity/DashCommunicator/dashconnection.cpp+33 plugins/Unity/DashCommunicator/dashconnection.h+34 plugins/Unity/DashCommunicator/dbusdashcommunicatorservice.cpp+2−2 plugins/Unity/DashCommunicator/dbusdashcommunicatorservice.h+2−2 plugins/Unity/Indicators/CMakeLists.txt−9 plugins/Unity/Indicators/Indicators.qmltypes+6−4 plugins/Unity/Indicators/plugin.cpp−2 plugins/Unity/Indicators/resources/artwork/messaging/default_app.svg−42 plugins/Unity/Indicators/resources/artwork/messaging/default_contact.png plugins/Unity/Indicators/resources/indicators.qrc−6 plugins/Unity/Launcher/CMakeLists.txt+7−5 plugins/Unity/Launcher/backend/launcherbackend.cpp−584 plugins/Unity/Launcher/backend/launcherbackend.h−196 plugins/Unity/Launcher/dbusinterface.cpp+232 plugins/Unity/Launcher/dbusinterface.h+50 plugins/Unity/Launcher/desktopfilehandler.cpp+151 plugins/Unity/Launcher/desktopfilehandler.h+56 plugins/Unity/Launcher/gsettings.cpp+66 plugins/Unity/Launcher/gsettings.h+37 plugins/Unity/Launcher/launcheritem.cpp+31 plugins/Unity/Launcher/launcheritem.h+19−20 plugins/Unity/Launcher/launchermodel.cpp+88−15 plugins/Unity/Launcher/launchermodel.h+15−8 plugins/Unity/Launcher/common/quicklistentry.cpp → plugins/Unity/Launcher/quicklistentry.cpp plugins/Unity/Launcher/common/quicklistentry.h → plugins/Unity/Launcher/quicklistentry.h plugins/Unity/Launcher/quicklistmodel.h+1−1 plugins/Unity/Session/CMakeLists.txt+7 plugins/Unity/Session/orientationlock.cpp+74 plugins/Unity/Session/orientationlock.h+60 plugins/Unity/Session/plugin.cpp+8−4 plugins/Utils/CMakeLists.txt+1 plugins/Utils/plugin.cpp+2 plugins/Utils/relativetimeformatter.cpp+268 plugins/Utils/relativetimeformatter.h+34 plugins/Utils/timeformatter.cpp+6−1 plugins/Utils/timeformatter.h+3−1 plugins/Utils/windowkeysfilter.cpp+1 po/am.po+145−94 po/ar.po+101−66 po/ast.po+154−98 po/az.po+144−106 po/be.po+369 po/bg.po+96−65 po/br.po+137−90 po/bs.po+90−65 po/ca.po+143−95 po/ckb.po+96−65 po/cs.po+96−65 po/da.po+100−66 po/de.po+134−91 po/el.po+110−69 po/en_AU.po+132−89 po/en_GB.po+134−91 po/eo.po+89−65 po/es.po+142−95 po/eu.po+160−103 po/fa.po+119−75 po/fi.po+135−90 po/fo.po+89−65 po/fr.po+139−92 po/gd.po+157−98 po/gl.po+133−92 po/he.po+108−71 po/hi.po+92−65 po/hr.po+90−65 po/hu.po+133−90 po/hy.po+89−65 po/id.po+89−65 po/is.po+151−95 po/it.po+132−89 po/ja.po+140−96 po/km.po+135−89 po/kn.po+89−65 po/ko.po+160−120 po/ku.po+401 po/ky.po+89−65 po/lo.po+96−65 po/lt.po+101−66 po/lv.po+112−80 po/ml.po+96−65 po/mr.po+89−65 po/ms.po+96−65 po/my.po+96−65 po/nb.po+136−91 po/nl.po+139−92 po/pl.po+101−66 po/pt.po+133−90 po/pt_BR.po+118−77 po/ro.po+143−92 po/ru.po+131−89 po/shn.po+89−65 po/si.po+89−65 po/sl.po+136−90 po/sq.po+89−65 po/sr.po+181−122 po/sv.po+147−94 po/sw.po+89−65 po/ta.po+96−65 po/te.po+100−66 po/th.po+253−105 po/tr.po+131−84 po/ug.po+155−100 po/uk.po+139−90 po/unity8.pot+82−59 po/vi.po+89−65 po/xh.po+89−65 po/zh_CN.po+99−71 po/zh_HK.po+100−66 po/zh_TW.po+147−98 qml/Components/Background.qml+1−1 qml/Components/DelayedLockscreen.qml+92 qml/Components/Dialogs.qml+10 qml/Stages/Dot.qml → qml/Components/Header.qml+9−7 qml/Components/LazyImage.qml+1 qml/Components/Lockscreen.qml+126−102 qml/Components/PassphraseLockscreen.qml+96−43 qml/Components/PinLockscreen.qml+10−5 qml/Components/ResponsiveGridView.qml+5−1 qml/Dash/CardCarousel.qml+1−1 qml/Dash/CardGrid.qml+3−2 qml/Dash/CardHorizontalList.qml+2−2 qml/Dash/CardTool.qml+20−15 qml/Dash/CardVerticalJournal.qml+3−2 qml/Dash/Dash.qml+13−1 qml/Dash/DashApplication.qml+2−8 qml/Dash/DashContent.qml+3 qml/Dash/DashNavigation.qml+3−3 qml/Dash/DashRenderer.qml+7−2 qml/Dash/GenericScopeView.qml+157−50 qml/Dash/PageHeader.qml+23−17 qml/Dash/PreviewListView.qml+2−2 qml/Dash/Previews/PreviewHeader.qml+13−1 qml/Dash/Previews/PreviewImageGallery.qml+121−18 qml/Dash/Previews/PreviewPayments.qml+8 qml/Dash/PullToRefreshScopeStyle.qml+82 qml/Dash/ScopeListView.qml+1 qml/Dash/ScopeSettingsPage.qml+1 qml/Dash/ScopesOverview.qml+7−1 qml/Dash/ScopesOverviewAll.qml+2 qml/Dash/ScopesOverviewFavorites.qml+1−1 qml/Dash/graphics/checkers.png qml/Dash/graphics/pixel.png qml/Greeter/Greeter.qml+1−1 qml/Greeter/GreeterContent.qml+3 qml/Launcher/Launcher.qml+2−2 qml/Launcher/LauncherDelegate.qml+4−2 qml/Launcher/LauncherPanel.qml+1 qml/Notifications/Notification.qml+133−47 qml/Notifications/NotificationMenuItemFactory.qml+4 qml/Notifications/Notifications.qml+1−1 qml/Panel/ActiveCallHint.qml+1−1 qml/Panel/IndicatorItem.qml+6 qml/Panel/Indicators.qml+2−13 qml/Panel/Indicators/DefaultIndicatorPage.qml+8−49 qml/Panel/Indicators/IndicatorBase.qml+1 qml/Panel/Indicators/IndicatorDelegate.qml+2−10 qml/Panel/Indicators/IndicatorsLight.qml+4−7 qml/Panel/Indicators/MenuItemFactory.qml+159−48 qml/Panel/Indicators/MessageMenuItemFactory.qml+156−171 qml/Panel/Indicators/RemoveBackground.qml−55 qml/Panel/Indicators/VisibleIndicators.qml+1 qml/Panel/Indicators/client/IndicatorsClient.qml+4 qml/Panel/MenuContent.qml+94−112 qml/Shell.qml+101−36 qml/Stages/Animations/BaseSurfaceAnimation.qml → qml/Stages/Animations/BaseSessionAnimation.qml+23−20 qml/Stages/Animations/DarkenAndFadeInAnimation.qml−48 qml/Stages/Animations/SwipeFromBottomAnimation.qml+24−19 qml/Stages/Animations/SwipeUpAnimation.qml−49 qml/Stages/ApplicationWindow.qml+69−72 qml/Stages/MainViewStyle.qml+79 qml/Stages/PageHeadStyle.qml+76 qml/Stages/PhoneStage.qml+17−3 qml/Stages/SessionContainer.qml+150 qml/Stages/Splash.qml+107−13 qml/Stages/SpreadDelegate.qml+3 qml/Stages/SurfaceContainer.qml+26−66 qml/Stages/TabletStage.qml+13 qml/Stages/TransformedTabletSpreadDelegate.qml+2−1 qml/Stages/WaitingDots.qml−76 qml/Stages/graphics/PageHeaderBaseDividerBottom@18.png qml/Stages/graphics/PageHeaderBaseDividerLight@18.png qml/Stages/graphics/PageHeaderBaseDividerLight@18.sci+5 qml/Stages/graphics/background_paper@27.png run_on_device.sh+43−41 src/CMakeLists.txt+1 src/Dash/CMakeLists.txt+3 src/Dash/main.cpp+17−2 src/Panel/CMakeLists.txt+2 src/libunity8-private/CMakeLists.txt+25 src/libunity8-private/abstractdbusservicemonitor.cpp+87 src/libunity8-private/abstractdbusservicemonitor.h+66 src/main.cpp+1 tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py+4−2 tests/autopilot/unity8/indicators/tests/test_indicators.py+1−1 tests/autopilot/unity8/process_helpers.py+12−17 tests/autopilot/unity8/shell/emulators/dash.py+4−4 tests/autopilot/unity8/shell/emulators/greeter.py+4−1 tests/autopilot/unity8/shell/tests/__init__.py+4−21 tests/autopilot/unity8/shell/tests/test_lock_screen.py+11−10 tests/autopilot/unity8/shell/tests/test_notifications.py+61−97 tests/mocks/AccountsService/AccountsService.cpp+24 tests/mocks/AccountsService/AccountsService.h+16 tests/mocks/AccountsService/AccountsService.qmltypes+1 tests/mocks/HudClient/fake_libhud_client.cpp+8−1 tests/mocks/LightDM/LightDM.qmltypes+2 tests/mocks/Powerd/Powerd.cpp+15−1 tests/mocks/Powerd/Powerd.h+8−1 tests/mocks/Powerd/Powerd.qmltypes+3−3 tests/mocks/QtMultimedia/audio.cpp+1−1 tests/mocks/Ubuntu/CMakeLists.txt+1 tests/mocks/Ubuntu/Connectivity/CMakeLists.txt+10 tests/mocks/Ubuntu/Connectivity/networking-status.cpp+64 tests/mocks/Ubuntu/Connectivity/networking-status.h+73 tests/mocks/Ubuntu/Connectivity/plugin.cpp+46 tests/mocks/Ubuntu/Connectivity/plugin.h+35 tests/mocks/Ubuntu/Connectivity/qmldir+2 tests/mocks/Ubuntu/Payments/MockPayments.cpp+12−7 tests/mocks/Ubuntu/Payments/MockPayments.h+2 tests/mocks/Ubuntu/SystemImage/SystemImage.qmltypes+3−1 tests/mocks/Ubuntu/Telephony/MockCallEntry.cpp+26−1 tests/mocks/Ubuntu/Telephony/MockCallEntry.h+9−1 tests/mocks/Unity/Application/Application.qmltypes+115−70 tests/mocks/Unity/Application/ApplicationDBusAdaptor.cpp−81 tests/mocks/Unity/Application/ApplicationInfo.cpp+36−85 tests/mocks/Unity/Application/ApplicationInfo.h+18−23 tests/mocks/Unity/Application/ApplicationManager.cpp+35−16 tests/mocks/Unity/Application/ApplicationManager.h+7−4 tests/mocks/Unity/Application/ApplicationTestInterface.cpp+117 tests/mocks/Unity/Application/ApplicationDBusAdaptor.h → tests/mocks/Unity/Application/ApplicationTestInterface.h+13−11 tests/mocks/Unity/Application/CMakeLists.txt+7−2 tests/mocks/Unity/Application/MirSurfaceItem.cpp+27−73 tests/mocks/Unity/Application/MirSurfaceItem.h+31−31 tests/mocks/Unity/Application/MirSurfaceItem.qml+12−2 tests/mocks/Unity/Application/MirSurfaceItemModel.h+35 tests/mocks/Unity/Application/ObjectListModel.h+106 tests/mocks/Unity/Application/Session.cpp+174 tests/mocks/Unity/Application/Session.h+90 tests/mocks/Unity/Application/SessionManager.cpp+55 tests/mocks/Unity/Application/SessionManager.h+44 tests/mocks/Unity/Application/SessionModel.h+35 tests/mocks/Unity/Application/SurfaceManager.cpp+20−7 tests/mocks/Unity/Application/SurfaceManager.h+6−2 tests/mocks/Unity/Application/plugin.cpp+37−4 tests/mocks/Unity/DashCommunicator/dashcommunicatorservice.cpp+2−2 tests/mocks/Unity/DashCommunicator/dashcommunicatorservice.h+2−2 tests/mocks/Unity/Indicators/FakeMenuPage.qml−10 tests/mocks/Unity/Indicators/Indicators.qmltypes+20 tests/mocks/Unity/Launcher/CMakeLists.txt+1−1 tests/mocks/Unity/Launcher/MockLauncherItem.cpp+14 tests/mocks/Unity/Launcher/MockLauncherItem.h+18−17 tests/mocks/Unity/Launcher/MockLauncherModel.cpp+10 tests/mocks/Unity/Unity.qmltypes+30−2 tests/mocks/Unity/fake_categories.cpp+95−136 tests/mocks/Unity/fake_categories.h+7−12 tests/mocks/Unity/fake_resultsmodel.cpp+9 tests/mocks/Unity/fake_resultsmodel.h+3 tests/mocks/Unity/fake_scope.cpp+28−6 tests/mocks/Unity/fake_scope.h+8−1 tests/mocks/Unity/fake_scopes.cpp+1 tests/plugins/Dash/CMakeLists.txt+3−3 tests/plugins/Dash/cardcreator/1.res+9−8 tests/plugins/Dash/cardcreator/2.res+10−13 tests/plugins/Dash/cardcreator/3.res+12−12 tests/plugins/Dash/cardcreator/4.res+8−11 tests/plugins/Dash/cardcreator/5.res+14−14 tests/plugins/Dash/cardcreator/6.res+8−10 tests/plugins/Dash/cardcreator/7.res+12−15 tests/plugins/Dash/listviewwithpageheadertest.cpp+39 tests/plugins/Dash/listviewwithpageheadertest.qml+1 tests/plugins/Dash/listviewwithpageheadertestsection.qml+1 tests/plugins/Dash/listviewwithpageheadertestsectionexternalmodel.qml+1 tests/plugins/Ubuntu/Gestures/CMakeLists.txt+1−1 tests/plugins/Unity/Launcher/CMakeLists.txt+10−25 tests/plugins/Unity/Launcher/gsettings.cpp+40 tests/plugins/Unity/Launcher/gsettings.h+38 tests/plugins/Unity/Launcher/launcherbackendtest.cpp−239 tests/plugins/Unity/Launcher/launchermodeltest.cpp+89−2 tests/plugins/Utils/CMakeLists.txt+2−3 tests/plugins/Utils/timeformattertest.cpp+104−7 tests/qmltests/CMakeLists.txt+3−1 tests/qmltests/Components/CMakeLists.txt+1−1 tests/qmltests/Components/tst_DragHandle/HorizontalShowable.qml+1−1 tests/qmltests/Components/tst_DragHandle/VerticalShowable.qml+1−1 tests/qmltests/Greeter/tst_Lockscreen.qml → tests/qmltests/Components/tst_Lockscreen.qml+31−51 tests/qmltests/Dash/CardHelpers.js+1−12 tests/qmltests/Dash/Previews/tst_PreviewHeader.qml+4−2 tests/qmltests/Dash/Previews/tst_PreviewImageGallery.qml+51−1 tests/qmltests/Dash/Previews/tst_PreviewPayments.qml+88−9 tests/qmltests/Dash/tst_Card.qml+29−3 tests/qmltests/Dash/tst_CardTool.qml+28−20 tests/qmltests/Dash/tst_Dash.qml+25−41 tests/qmltests/Dash/tst_DashContent.qml+14−1 tests/qmltests/Dash/tst_GenericScopeView.qml+157−7 tests/qmltests/Dash/tst_PreviewListView.qml+29−1 tests/qmltests/Launcher/tst_Launcher.qml+3−1 tests/qmltests/Notifications/tst_Notifications.qml+60−18 tests/qmltests/Panel/Indicators/tst_DefaultIndicatorPage.qml+3−23 tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml+32−16 tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml+43−53 tests/qmltests/Panel/tst_ActiveCallHint.qml+20−7 tests/qmltests/Panel/tst_Indicators.qml+10−10 tests/qmltests/Panel/tst_MenuContent.qml+14−56 tests/qmltests/Stages/RecursingChildSessionControl.qml+142 tests/qmltests/Stages/tst_ApplicationWindow.qml+113−43 tests/qmltests/Stages/tst_PhoneStage.qml+59−1 tests/qmltests/Stages/tst_SessionContainer.qml+330 tests/qmltests/Stages/tst_Splash.qml+117 tests/qmltests/Stages/tst_SurfaceContainer.qml+28−43 tests/qmltests/Components/tst_DragHandle/UnityLogo.png → tests/qmltests/UnityLogo.png tests/qmltests/tst_Shell.qml+151−45 tests/qmltests/tst_ShellWithPin.qml+13−6 tests/utils/modules/Unity/Test/UnityTestCase.qml+3−2 tools/registry-tracker.cpp+6 tools/scopetool.cpp+3 tools/unlock-device+14−19
CMakeLists.txt+2−2
@@ -64,13 +64,13 @@ if(SHELL_INSTALL_QML STREQUAL "")
6464 message(FATAL_ERROR "Could not determine plugin installation dir.")
6565endif()
6666
67+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
68+
6769execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=plugindir unity-shell-api OUTPUT_VARIABLE SHELL_PLUGINDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
6870if(SHELL_PLUGINDIR STREQUAL "")
6971 message(FATAL_ERROR "Could not determine plugin import dir.")
7072endif()
7173
72−set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
73−
7474set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-permissive -pedantic -Wall -Wextra")
7575
7676if ("${CMAKE_BUILD_TYPE}" STREQUAL "release" OR "${CMAKE_BUILD_TYPE}" STREQUAL "relwithdebinfo")
CODING+4
@@ -154,6 +154,10 @@ So, for the DragHandle component that would be:
154154
155155$ make testDragHandle
156156
157+To run the tests for a single component/class under gdb (so you can catch SEGFAULTS)
158+
159+$ make gdbtestComponentName
160+
157161To run a test application that allow you to manually test or to simply try out
158162a given component:
159163
build.sh+1
@@ -51,6 +51,7 @@ install_dependencies() {
5151 qtdeclarative5-ubuntu-settings-components \
5252 qtdeclarative5-ubuntu-telephony0.1 \
5353 qtdeclarative5-ubuntu-thumbnailer0.1 \
54+ qml-module-ubuntu-connectivity \
5455 unity-notifications-impl \
5556 ubuntu-mobile-icons \
5657 unity-scope-home \
cmake/modules/QmlTest.cmake+25−4
@@ -12,6 +12,7 @@
1212# Two targets will be created:
1313# - testComponentName - Runs the test with qmltestrunner
1414# - tryComponentName - Runs the test with uqmlscene, for manual interaction
15+# - gdbtestComponentName - Runs the test with qmltestrunner under gdb
1516#
1617# To change/set a default value for the whole test suite, prior to calling add_qml_test, set:
1718# qmltest_DEFAULT_NO_ADD_TEST (default: FALSE)
@@ -27,11 +28,14 @@ endif()
2728
2829set(qmlscene_exe ${CMAKE_BINARY_DIR}/tests/uqmlscene/uqmlscene)
2930
31+set(test_env UNITY_TESTING=1)
32+
3033macro(add_manual_qml_test SUBPATH COMPONENT_NAME)
3134 set(options NO_ADD_TEST NO_TARGETS)
3235 set(multi_value_keywords IMPORT_PATHS TARGETS PROPERTIES ENVIRONMENT)
3336
3437 cmake_parse_arguments(qmltest "${options}" "" "${multi_value_keywords}" ${ARGN})
38+ cmake_parse_arguments(qmltest_default "${options}" "" "${multi_value_keywords}" ${qmltest_DEFAULT_PROPERTIES})
3539
3640 set(qmlscene_TARGET try${COMPONENT_NAME})
3741 set(qmltest_FILE ${SUBPATH}/tst_${COMPONENT_NAME})
@@ -49,8 +53,12 @@ macro(add_manual_qml_test SUBPATH COMPONENT_NAME)
4953 endforeach(IMPORT_PATH)
5054 endif()
5155
56+ if("${qmltest_ENVIRONMENT}" STREQUAL "")
57+ set(qmltest_ENVIRONMENT "${qmltest_default_ENVIRONMENT}")
58+ endif()
59+
5260 set(qmlscene_command
53− env ${qmltest_ENVIRONMENT}
61+ env ${test_env} ${qmltest_ENVIRONMENT}
5462 ${qmlscene_exe} -qmljsdebugger=port:3768 ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
5563 ${qmlscene_imports}
5664 )
@@ -71,8 +79,10 @@ macro(add_qml_test_internal SUBPATH COMPONENT_NAME ITERATIONS)
7179 set(multi_value_keywords IMPORT_PATHS TARGETS PROPERTIES ENVIRONMENT)
7280
7381 cmake_parse_arguments(qmltest "${options}" "" "${multi_value_keywords}" ${ARGN})
82+ cmake_parse_arguments(qmltest_default "${options}" "" "${multi_value_keywords}" ${qmltest_DEFAULT_PROPERTIES})
7483
7584 set(qmltest_TARGET test${COMPONENT_NAME})
85+ set(qmltest_gdb_TARGET gdbtest${COMPONENT_NAME})
7686 set(qmltest_xvfb_TARGET xvfbtest${COMPONENT_NAME})
7787 set(qmltest_FILE ${SUBPATH}/tst_${COMPONENT_NAME})
7888
@@ -102,8 +112,12 @@ macro(add_qml_test_internal SUBPATH COMPONENT_NAME ITERATIONS)
102112 set(ITERATIONS_STRING "")
103113 endif()
104114
115+ if("${qmltest_ENVIRONMENT}" STREQUAL "")
116+ set(qmltest_ENVIRONMENT "${qmltest_default_ENVIRONMENT}")
117+ endif()
118+
105119 set(qmltest_command
106− env ${qmltest_ENVIRONMENT} UNITY_TESTING=1
120+ env ${test_env} ${qmltest_ENVIRONMENT}
107121 ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
108122 ${qmltestrunner_imports}
109123 ${ITERATIONS_STRING}
@@ -117,7 +131,7 @@ macro(add_qml_test_internal SUBPATH COMPONENT_NAME ITERATIONS)
117131 set(LD_PRELOAD_PATH "LD_PRELOAD=/usr/lib/${ARCH_TRIPLET}/mesa/libGL.so.1")
118132 endif()
119133 set(qmltest_xvfb_command
120− env ${qmltest_ENVIRONMENT} ${LD_PRELOAD_PATH} UNITY_TESTING=1
134+ env ${test_env} ${qmltest_ENVIRONMENT} ${LD_PRELOAD_PATH}
121135 xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum
122136 ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
123137 ${qmltestrunner_imports}
@@ -126,12 +140,18 @@ macro(add_qml_test_internal SUBPATH COMPONENT_NAME ITERATIONS)
126140 ${function_ARGS}
127141 )
128142
143+ set(qmltest_gdb_command
144+ env ${test_env} ${qmltest_ENVIRONMENT} ${LD_PRELOAD_PATH}
145+ gdb -e ${qmltestrunner_exe} -ex \"run -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml ${qmltestrunner_imports} ${ITERATIONS_STRING}\"
146+ )
147+
129148 add_qmltest_target(${qmltest_TARGET} "${qmltest_command}" TRUE ${qmltest_NO_ADD_TEST})
130149 add_qmltest_target(${qmltest_xvfb_TARGET} "${qmltest_xvfb_command}" ${qmltest_NO_TARGETS} TRUE)
150+ add_qmltest_target(${qmltest_gdb_TARGET} "${qmltest_gdb_command}" TRUE TRUE)
131151 add_manual_qml_test(${SUBPATH} ${COMPONENT_NAME} ${ARGN})
132152endmacro(add_qml_test_internal)
133153
134−macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS)
154+macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS ENVVAR)
135155 set(testCommand
136156 LD_LIBRARY_PATH=${LD_PATH}
137157 ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
@@ -148,6 +168,7 @@ macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS)
148168 endif()
149169 set(xvfbtestCommand
150170 ${LD_PRELOAD_PATH}
171+ ${ENVVAR}
151172 LD_LIBRARY_PATH=${LD_PATH}
152173 xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum
153174 ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
data/unity8-dash.desktop.in+3−3
@@ -1,9 +1,9 @@
11[Desktop Entry]
22Type=Application
3−Name=Unity 8 Dash
4−Comment=The converged Unity shell dash
3+Name=Scopes
4+Comment=An interface for using the Scopes system
55Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity8-dash
66Terminal=false
7−Icon=unity8
7+Icon=
88NoDisplay=true
99X-Ubuntu-Touch=true
data/unity8-filewatcher.confnew file+8
@@ -0,0 +1,8 @@
1+description "File system watcher for unity8"
2+author "Michael Zanetti <michael.zanetti@canonical.com>"
3+
4+# Workaround for bug 1360208. ~ and * in one expression doesn't work currently
5+start on (file FILE=/home/phablet/.local/share/applications/*.desktop) or (file FILE=/usr/share/applications/*.desktop)
6+
7+exec dbus-send --type=method_call --dest=com.canonical.Unity.Launcher /com/canonical/Unity/Launcher com.canonical.Unity.Launcher.Refresh
8+
data/unity8.conf+5−1
@@ -34,11 +34,15 @@ pre-start script
3434 gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.UpdateActivationEnvironment "@a{ss} {'MIR_SOCKET': '$MIR_SERVER_FILE'}"
3535 fi
3636
37− # Remove the socket if still there
37+ # Remove the normal and trusted sockets if still there
3838 if [ -S "$MIR_SERVER_FILE" ]; then
3939 rm "$MIR_SERVER_FILE"
4040 fi
4141
42+ if [ -S "${MIR_SERVER_FILE}_trusted" ]; then
43+ rm "${MIR_SERVER_FILE}_trusted"
44+ fi
45+
4246 initctl set-env --global MIR_SERVER_PROMPT_FILE=1
4347
4448 initctl emit --no-wait indicator-services-start
data/unity8.desktop.in+1−1
@@ -4,6 +4,6 @@ Name=Unity 8
44Comment=The converged Unity shell
55Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity8
66Terminal=false
7−Icon=unity8
7+Icon=
88NoDisplay=true
99X-Ubuntu-Touch=true
debian/changelog+263
@@ -1,3 +1,266 @@
1+unity8 (8.00+14.10.20141006-0ubuntu1) utopic; urgency=low
2+
3+ [ Andrea Cimitan ]
4+ * Tweak card header to match the spec
5+ * Add preview image slideshow (LP: #1351537)
6+
7+ [ Michał Sawicz ]
8+ * Cache more things in memory, so flicking scopes should be faster
9+ (LP: #1336724)
10+ * Tweak card header to match the spec
11+ * Save texture memory by limiting sourceSize (LP: #1338430)
12+
13+ [ Ying-Chun Liu ]
14+ * Add attributes to Preview. (LP: #1282460)
15+
16+ [ Albert Astals ]
17+ * Update pot
18+ * Cache more things in memory, so flicking scopes should be faster
19+ (LP: #1336724)
20+ * Save texture memory by limiting sourceSize (LP: #1338430)
21+ * Clip the settings list
22+ * Fix unlocking from the left again
23+ * Add wait_ makes tests more reliable
24+
25+ [ Michael Zanetti ]
26+ * fix fading out the launcher instead of sliding it out on left-edge
27+ minimizing an app.
28+ * Make the DashCommunicator async and more flexible to handle a
29+ lifecycle-suspended dash (LP: #1339883)
30+
31+ [ Michael Terry ]
32+ * Retry unlock-device script if it fails, as there is always a risk of
33+ a small race with boot-up. (LP: #1370644)
34+ * Add pull-to-refresh functionality to scopes. (LP: #1368336)
35+
36+ [ CI bot ]
37+ * Resync trunk
38+
39+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 06 Oct 2014 08:03:23 +0000
40+
41+unity8 (8.00+14.10.20140930.2-0ubuntu1) utopic; urgency=low
42+
43+ [ Alexandros Frantzis ]
44+ * Remove stale trusted socket before starting unity8 from upstart (LP:
45+ #1371597) (LP: #1371597)
46+
47+ [ CI bot ]
48+ * Resync trunk
49+
50+ [ Andrea Cimitan ]
51+ * Move activity indicator on top of keyboard (LP: #1354519)
52+
53+ [ Gerry Boland ]
54+ * Cleanup: Remove unused member and fix small syntax error in
55+ OrientationLock
56+
57+ [ josharenson ]
58+ * Fix lp:1367894 by correcting how the minute value is calculated in
59+ the panel. (LP: #1367894)
60+
61+ [ Nick Dedekind ]
62+ * Fixed DefaultIndicatorPage test. Fixed warnings from test.
63+
64+ [ Ying-Chun Liu ]
65+ * Remove maxLineCount in preview. (LP: 1328513) (LP: #1328513)
66+
67+ [ Michael Terry ]
68+ * Fix some code that accidentally landed in trunk before it got
69+ cleaned up. The current code just has some duplication to it that
70+ should be unified.
71+ * Implement latest visual designs for passphrase lockscreen.
72+ * Make it easier to use the Lockscreen component from the welcome
73+ wizard.
74+ * Limit how much memory we reserve for the greeter background image,
75+ allowing giant images to appear correctly.
76+
77+ [ Daniel d'Andrada ]
78+ * Add gdbTestComponentName build targets
79+
80+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 30 Sep 2014 16:57:28 +0000
81+
82+unity8 (8.00+14.10.20140926-0ubuntu1) utopic; urgency=low
83+
84+ [ CI bot ]
85+ * Resync trunk
86+
87+ [ Nick Dedekind ]
88+ * Visual changes for indicator RTM polishing (LP: #1329289)
89+
90+ [ Ubuntu daily release ]
91+ * New rebuild forced
92+
93+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 26 Sep 2014 19:12:39 +0000
94+
95+unity8 (8.00+14.10.20140923-0ubuntu1) utopic; urgency=low
96+
97+ [ Michael Zanetti ]
98+ * fix swiping away the launcher from the left edge
99+ * fix indicators AP test
100+
101+ [ Florian Boucault ]
102+ * New Splash screen implementation that fakes real app
103+
104+ [ Albert Astals ]
105+ * We need this in build-depends so that qmluitests pass in CI
106+
107+ [ Daniel d'Andrada ]
108+ * New Splash screen implementation that fakes real app
109+
110+ [ Michael Terry ]
111+ * Fix LC_ALL and test harder by making both manual runs of
112+ timeformattertest and the whole test suite use the same locale
113+ settings.
114+
115+ [ CI bot ]
116+ * Resync trunk
117+
118+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 23 Sep 2014 09:26:18 +0000
119+
120+unity8 (8.00+14.10.20140918.3-0ubuntu1) utopic; urgency=low
121+
122+ [ Michał Sawicz ]
123+ * Add -windowgeometry option to the Dash and drop any user-visible
124+ mentions of Dash
125+ * Dash: Fix issue when expanding a category and collapsing another one
126+ at the same time.
127+
128+ [ Albert Astals ]
129+ * Dash: Fix issue when expanding a category and collapsing another one
130+ at the same time.
131+ * Make the categoryView invisible when we are in the preview mode (LP:
132+ #1341205)
133+ * Pixel pushing in the dash header (LP: #1365929)
134+
135+ [ Ying-Chun Liu ]
136+ * Re-add restart button for power menu. (LP: 1358197) (LP: #1358197)
137+
138+ [ Marcus Tomlinson ]
139+ * Don't show a preview if a null response is returned from
140+ scope.preview(result)
141+
142+ [ Mirco Müller ]
143+ * Don't limit the number of text-lines for body-text. (LP: #1369438)
144+
145+ [ Michael Zanetti ]
146+ * Don't hide launcher when nothing happens on long left edge swipes
147+ (LP: #1357333)
148+ * Rework LauncherBackend
149+
150+ [ Michael Terry ]
151+ * When running qmluitests, make sure that they use LANGUAGE=C, fixing
152+ a test failure when running locally in the US.
153+
154+ [ Daniel d'Andrada ]
155+ * Some ApplicationWindow test improvements
156+
157+ [ Rodney Dawes ]
158+ * Check purchase state to determine if purchase was cancelled and hide
159+ progress. (LP: #1362622)
160+
161+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 18 Sep 2014 21:26:42 +0000
162+
163+unity8 (8.00+14.10.20140918-0ubuntu1) utopic; urgency=low
164+
165+ [ Michael Zanetti ]
166+ * Focus first app if there are already some running when we're
167+ starting up (LP: #1339883)
168+
169+ [ Michał Sawicz ]
170+ * Don't play empty urls in Notification.qml
171+
172+ [ Daniel d'Andrada ]
173+ * Improve tst_Shell
174+ * Build without any warnings
175+ * Make tst_Card work from outside the source tree (LP:1359201) (LP:
176+ #1359201)
177+
178+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 18 Sep 2014 09:44:06 +0000
179+
180+unity8 (8.00+14.10.20140910.1-0ubuntu1) utopic; urgency=low
181+
182+ [ Pete Woods ]
183+ * Disable OEM and Click scopes when system scopes are disabled
184+
185+ [ CI bot ]
186+ * Resync trunk
187+
188+ [ Pawel Stolowski ]
189+ * Set UNITY_SCOPES_NO_FAVORITES environment variable to make scopes
190+ plugin ignore favorite scopes and fix basic functionality of unity-
191+ scope-tool.
192+
193+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 10 Sep 2014 08:53:57 +0000
194+
195+unity8 (8.00+14.10.20140908.1-0ubuntu1) utopic; urgency=low
196+
197+ [ Michał Sawicz ]
198+ * Use a single white pixel instead of the heavier checkers image.
199+ * Add support to unlock-device for the new adbd coming down the
200+ pipeline. Also fix autopilot tests and run scripts for that.
201+ * Make LVWPH non interactive while on header animation
202+ * Improve references to scope/scopeStyle in PreviewListView and
203+ PageHeader, add tests.
204+
205+ [ Nick Dedekind ]
206+ * Support for nested prompt session. (LP: #1358388)
207+
208+ [ Albert Astals ]
209+ * Remove unused hasAttributes variable
210+ * Disable dash overview if in temp scope preview
211+ * Block mouse events under scope overview bottombar (LP: #1362206)
212+ * Fix regression in focus handling due to SDK change
213+ * Fix warning 'Background.qml:81:21: Unable to assign bool to QUrl'
214+ * Fix launcher internationalization
215+ * Make swipe and home button press in the launcher dismiss the
216+ overview
217+ * GSV: Use proper variable since altnav renames
218+ * Fix some "Cannot read property 'luminance' of null" warnings
219+ * Make LVWPH non interactive while on header animation
220+
221+ [ Mirco Müller ]
222+ * Implemented the needed visual updates on notifications requested by
223+ Design for RTM. (LP: #1348092)
224+
225+ [ Michael Terry ]
226+ * Don't show greeter when screen turns off during a call, even if
227+ proximity sensor isn't active. (LP: #1347001)
228+ * Add support to unlock-device for the new adbd coming down the
229+ pipeline. Also fix autopilot tests and run scripts for that.
230+
231+ [ Michael Zanetti ]
232+ * open the application when clicking on the title entry in the
233+ quicklist (LP: #1336380)
234+ * Don't animate x while dragging apps from the left edge (LP:
235+ #1360105)
236+
237+ [ Diego Sarmentero ]
238+ * Reset button state on cancel (LP: #1362622)
239+
240+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 08 Sep 2014 14:16:42 +0000
241+
242+unity8 (8.00+14.10.20140903.1-0ubuntu1) utopic; urgency=low
243+
244+ [ Nick Dedekind ]
245+ * Support for nested prompt session. (LP: #1358388)
246+
247+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 03 Sep 2014 07:58:49 +0000
248+
249+unity8 (8.00+14.10.20140828.1-0ubuntu1) utopic; urgency=low
250+
251+ [ Michael Terry ]
252+ * Reverse default for the user option "allow launcher/panel in greeter
253+ when locked." And allow that property to be controlled by an
254+ AccountsService property. (LP: #1358340) (LP: #1358340)
255+ * With recent password support, we want to be able to unlock the
256+ device even with a password set. And we need to be able to do this
257+ once the new adbd lands. So I've added a DBus command to hide the
258+ greeter. This should be secure because all apps are constrained and
259+ if you're on the local session bus unconstrained, you already have
260+ access to anything you want.
261+
262+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 28 Aug 2014 20:06:41 +0000
263+
1264unity8 (8.00+14.10.20140827.2-0ubuntu1) utopic; urgency=low
2265
3266 [ Michał Sawicz ]
debian/control+12−10
@@ -7,6 +7,7 @@ Build-Depends: cmake,
77 debhelper (>= 9),
88 doxyqml,
99 graphviz,
10+ gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
1011# We rely on C++11 features, and to prevent from ABI breaks
1112# in libstdc++ causing us issues, we explicitly select a G++
1213# version.
@@ -24,7 +25,7 @@ Build-Depends: cmake,
2425 libpulse-dev,
2526 libqmenumodel-dev (>= 0.2.8),
2627 libqt5xmlpatterns5-dev,
27− libunity-api-dev (>= 7.89),
28+ libunity-api-dev (>= 7.92),
2829 libusermetricsoutput1-dev,
2930 libxcb1-dev,
3031 pkg-config,
@@ -44,7 +45,7 @@ Build-Depends: cmake,
4445 qtdeclarative5-dev-tools,
4546 qtdeclarative5-private-dev (>= 5.2.1),
4647 qtdeclarative5-qtmultimedia-plugin,
47− qtdeclarative5-ubuntu-settings-components (>= 0.3),
48+ qtdeclarative5-ubuntu-settings-components (>= 0.4),
4849 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.49) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 0.1.49),
4950 ttf-ubuntu-font-family,
5051Standards-Version: 3.9.4
@@ -85,9 +86,9 @@ Depends: gsettings-desktop-schemas,
8586 qmenumodel-qml (>= 0.2.8),
8687 qml-module-qtquick-xmllistmodel,
8788 qtdeclarative5-gsettings1.0,
88− qtdeclarative5-qtmir-plugin (>= 0.4.1),
89+ qtdeclarative5-qtmir-plugin (>= 0.4.3),
8990 qtdeclarative5-ubuntu-telephony0.1,
90− unity-launcher-impl-3,
91+ unity-launcher-impl-4,
9192 unity8-common (= ${source:Version}),
9293 unity8-private (= ${binary:Version}),
9394 unity8-private | unity-launcher-impl,
@@ -107,12 +108,12 @@ Description: Unity 8 shell
107108Package: unity8-common
108109Architecture: all
109110Depends: qml-module-qtquick-layouts,
110− qtdeclarative5-ubuntu-settings-components (>= 0.3),
111+ qtdeclarative5-ubuntu-settings-components (>= 0.4),
111112 qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
112113 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.49) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 0.1.49),
113114 qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
114115 ubuntu-thumbnailer-impl-0,
115− unity-application-impl-3,
116+ unity-application-impl-4,
116117 unity-notifications-impl-3,
117118 unity-plugin-scopes | unity-scopes-impl,
118119 unity-scopes-impl-4,
@@ -159,7 +160,7 @@ Pre-Depends: ${misc:Pre-Depends},
159160Depends: ${misc:Depends},
160161 ${shlibs:Depends},
161162Provides: unity-application-impl,
162− unity-application-impl-3,
163+ unity-application-impl-4,
163164Description: Fake environment for running Unity 8 shell
164165 Provides fake implementations of some QML modules used by Unity 8 shell
165166 (e.g Ubuntu.Application) so that you can run it in a sandboxed environment.
@@ -168,15 +169,16 @@ Package: unity8-private
168169Architecture: any
169170Multi-Arch: same
170171Pre-Depends: ${misc:Pre-Depends},
171−Depends: accountsservice-ubuntu-schemas,
172+Depends: accountsservice-ubuntu-schemas (>= 0.0.3),
172173 gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
173174 libhardware2,
174− libunity-core-6.0-9,
175+ unity-schemas (>= 7.3.1+14.10.20140915),
175176 pay-service,
177+ qml-module-ubuntu-connectivity,
176178 ${misc:Depends},
177179 ${shlibs:Depends},
178180Provides: unity-launcher-impl,
179− unity-launcher-impl-3,
181+ unity-launcher-impl-4,
180182Description: Unity 8 private libs
181183 The Unity 8 shell is the primary user interface for Ubuntu devices.
182184 .
debian/unity8-private.install+1
@@ -1,3 +1,4 @@
1+usr/lib/*/libunity8-private.*
12usr/lib/*/unity8/qml/AccountsService
23usr/lib/*/unity8/qml/Dash
34usr/lib/*/unity8/qml/HudClient
debian/unity8.install+1
@@ -1,5 +1,6 @@
11data/unity8.conf usr/share/upstart/sessions/
22data/unity8-dash.conf usr/share/upstart/sessions/
3+data/unity8-filewatcher.conf usr/share/upstart/sessions/
34usr/bin/unity8
45usr/bin/unity8-dash
56usr/share/applications/unity8.desktop
plugins/AccountsService/AccountsService.cpp+38
@@ -26,6 +26,8 @@ AccountsService::AccountsService(QObject* parent)
2626 m_service(new AccountsServiceDBusAdaptor(this)),
2727 m_user(qgetenv("USER")),
2828 m_demoEdges(false),
29+ m_enableLauncherWhileLocked(false),
30+ m_enableIndicatorsWhileLocked(false),
2931 m_statsWelcomeScreen(false),
3032 m_passwordDisplayHint(Keyboard),
3133 m_failedLogins(0)
@@ -47,6 +49,8 @@ void AccountsService::setUser(const QString &user)
4749 Q_EMIT userChanged();
4850
4951 updateDemoEdges();
52+ updateEnableLauncherWhileLocked();
53+ updateEnableIndicatorsWhileLocked();
5054 updateBackgroundFile();
5155 updateStatsWelcomeScreen();
5256 updatePasswordDisplayHint();
@@ -64,6 +68,16 @@ void AccountsService::setDemoEdges(bool demoEdges)
6468 m_service->setUserProperty(m_user, "com.canonical.unity.AccountsService", "demo-edges", demoEdges);
6569}
6670
71+bool AccountsService::enableLauncherWhileLocked() const
72+{
73+ return m_enableLauncherWhileLocked;
74+}
75+
76+bool AccountsService::enableIndicatorsWhileLocked() const
77+{
78+ return m_enableIndicatorsWhileLocked;
79+}
80+
6781QString AccountsService::backgroundFile() const
6882{
6983 return m_backgroundFile;
@@ -88,6 +102,24 @@ void AccountsService::updateDemoEdges()
88102 }
89103}
90104
105+void AccountsService::updateEnableLauncherWhileLocked()
106+{
107+ auto enableLauncherWhileLocked = m_service->getUserProperty(m_user, "com.ubuntu.AccountsService.SecurityPrivacy", "EnableLauncherWhileLocked").toBool();
108+ if (m_enableLauncherWhileLocked != enableLauncherWhileLocked) {
109+ m_enableLauncherWhileLocked = enableLauncherWhileLocked;
110+ Q_EMIT enableLauncherWhileLockedChanged();
111+ }
112+}
113+
114+void AccountsService::updateEnableIndicatorsWhileLocked()
115+{
116+ auto enableIndicatorsWhileLocked = m_service->getUserProperty(m_user, "com.ubuntu.AccountsService.SecurityPrivacy", "EnableIndicatorsWhileLocked").toBool();
117+ if (m_enableIndicatorsWhileLocked != enableIndicatorsWhileLocked) {
118+ m_enableIndicatorsWhileLocked = enableIndicatorsWhileLocked;
119+ Q_EMIT enableIndicatorsWhileLockedChanged();
120+ }
121+}
122+
91123void AccountsService::updateBackgroundFile()
92124{
93125 auto backgroundFile = m_service->getUserProperty(m_user, "org.freedesktop.Accounts.User", "BackgroundFile").toString();
@@ -157,6 +189,12 @@ void AccountsService::propertiesChanged(const QString &user, const QString &inte
157189 if (changed.contains("PasswordDisplayHint")) {
158190 updatePasswordDisplayHint();
159191 }
192+ if (changed.contains("EnableLauncherWhileLocked")) {
193+ updateEnableLauncherWhileLocked();
194+ }
195+ if (changed.contains("EnableIndicatorsWhileLocked")) {
196+ updateEnableIndicatorsWhileLocked();
197+ }
160198 }
161199}
162200
plugins/AccountsService/AccountsService.h+14
@@ -36,6 +36,12 @@ class AccountsService: public QObject
3636 READ demoEdges
3737 WRITE setDemoEdges
3838 NOTIFY demoEdgesChanged)
39+ Q_PROPERTY (bool enableLauncherWhileLocked
40+ READ enableLauncherWhileLocked
41+ NOTIFY enableLauncherWhileLockedChanged)
42+ Q_PROPERTY (bool enableIndicatorsWhileLocked
43+ READ enableIndicatorsWhileLocked
44+ NOTIFY enableIndicatorsWhileLockedChanged)
3945 Q_PROPERTY (QString backgroundFile
4046 READ backgroundFile
4147 NOTIFY backgroundFileChanged)
@@ -62,6 +68,8 @@ public:
6268 void setUser(const QString &user);
6369 bool demoEdges() const;
6470 void setDemoEdges(bool demoEdges);
71+ bool enableLauncherWhileLocked() const;
72+ bool enableIndicatorsWhileLocked() const;
6573 QString backgroundFile() const;
6674 bool statsWelcomeScreen() const;
6775 PasswordDisplayHint passwordDisplayHint() const;
@@ -71,6 +79,8 @@ public:
7179Q_SIGNALS:
7280 void userChanged();
7381 void demoEdgesChanged();
82+ void enableLauncherWhileLockedChanged();
83+ void enableIndicatorsWhileLockedChanged();
7484 void backgroundFileChanged();
7585 void statsWelcomeScreenChanged();
7686 void passwordDisplayHintChanged();
@@ -82,6 +92,8 @@ private Q_SLOTS:
8292
8393private:
8494 void updateDemoEdges();
95+ void updateEnableLauncherWhileLocked();
96+ void updateEnableIndicatorsWhileLocked();
8597 void updateBackgroundFile();
8698 void updateStatsWelcomeScreen();
8799 void updatePasswordDisplayHint();
@@ -90,6 +102,8 @@ private:
90102 AccountsServiceDBusAdaptor *m_service;
91103 QString m_user;
92104 bool m_demoEdges;
105+ bool m_enableLauncherWhileLocked;
106+ bool m_enableIndicatorsWhileLocked;
93107 QString m_backgroundFile;
94108 bool m_statsWelcomeScreen;
95109 PasswordDisplayHint m_passwordDisplayHint;
plugins/AccountsService/AccountsService.qmltypes+1
@@ -26,5 +26,6 @@ Module {
2626 Property { name: "backgroundFile"; type: "string"; isReadonly: true }
2727 Property { name: "statsWelcomeScreen"; type: "bool"; isReadonly: true }
2828 Property { name: "passwordDisplayHint"; type: "PasswordDisplayHint"; isReadonly: true }
29+ Property { name: "failedLogins"; type: "uint" }
2930 }
3031}
plugins/Dash/CardAttributes.qml+1−1
@@ -59,7 +59,7 @@ GridLayout {
5959 text: "value" in modelData && modelData["value"] || "";
6060 elide: Text.ElideRight
6161 maximumLineCount: 1
62− font.weight: "style" in modelData && modelData["style"] == "highlighted" ? Font.DemiBold : Font.Light
62+ font.weight: "style" in modelData && modelData["style"] === "highlighted" ? Font.Bold : Font.Light
6363 fontSize: "small"
6464 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)
6565 color: grid.color
plugins/Dash/CardCreator.js+19−20
@@ -78,16 +78,17 @@ var kArtShapeHolderCode = 'Item { \n\
7878 width = root.fixedArtShapeSize.width; \n\
7979 height = root.fixedArtShapeSize.height; \n\
8080 } else { \n\
81− width = Qt.binding(function() { return !visible ? 0 : image.width }); \n\
82− height = Qt.binding(function() { return !visible ? 0 : image.height }); \n\
81+ width = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.width }); \n\
82+ height = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.height }); \n\
8383 } \n\
8484 } \n\
85− image: Image { \n\
85+ image: CroppedImageMinimumSourceSize { \n\
8686 objectName: "artImage"; \n\
87− source: cardData && cardData["art"] || ""; \n\
87+ property bool doLoadSource: !NetworkingStatus.limitedBandwith; \n\
88+ source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; } \n\
8889 cache: true; \n\
8990 asynchronous: root.asynchronous; \n\
90− fillMode: Image.PreserveAspectCrop; \n\
91+ visible: false; \n\
9192 width: %2; \n\
9293 height: %3; \n\
9394 } \n\
@@ -190,16 +191,14 @@ var kMascotShapeLoaderCode = 'Loader { \n\
190191
191192// %1 is used as anchors of mascotImage
192193// %2 is used as visible of mascotImage
193−var kMascotImageCode = 'Image { \n\
194+var kMascotImageCode = 'CroppedImageMinimumSourceSize { \n\
194195 id: mascotImage; \n\
195196 objectName: "mascotImage"; \n\
196197 anchors { %1 } \n\
197− readonly property int maxSize: Math.max(width, height) * 4; \n\
198− source: cardData && cardData["mascot"] || ""; \n\
198+ property bool doLoadSource: !NetworkingStatus.limitedBandwith; \n\
199+ source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["mascot"] || ""; } \n\
199200 width: units.gu(6); \n\
200201 height: units.gu(5.625); \n\
201− sourceSize { width: maxSize; height: maxSize } \n\
202− fillMode: Image.PreserveAspectCrop; \n\
203202 horizontalAlignment: Image.AlignHCenter; \n\
204203 verticalAlignment: Image.AlignVCenter; \n\
205204 visible: %2; \n\
@@ -220,13 +219,13 @@ var kTitleLabelCode = 'Label { \n\
220219 color: %2; \n\
221220 visible: showHeader %3; \n\
222221 text: root.title; \n\
223− font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal; \n\
224− horizontalAlignment: root.headerAlignment; \n\
222+ font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal; \n\
223+ horizontalAlignment: root.titleAlignment; \n\
225224 }\n';
226225
227226// %1 is used as extra anchors of emblemIcon
228227// %2 is used as color of emblemIcon
229−var kEmblemIconCode = 'Icon { \n\
228+var kEmblemIconCode = 'StatusIcon { \n\
230229 id: emblemIcon; \n\
231230 objectName: "emblemIcon"; \n\
232231 anchors { \n\
@@ -236,7 +235,6 @@ var kEmblemIconCode = 'Icon { \n\
236235 } \n\
237236 source: cardData && cardData["emblem"] || ""; \n\
238237 color: %2; \n\
239− width: height; \n\
240238 height: source != "" ? titleLabel.font.pixelSize : 0; \n\
241239 }\n';
242240
@@ -258,13 +256,12 @@ var kSubtitleLabelCode = 'Label { \n\
258256 anchors { %1 } \n\
259257 anchors.topMargin: units.dp(2); \n\
260258 elide: Text.ElideRight; \n\
261− fontSize: "small"; \n\
259+ fontSize: "x-small"; \n\
262260 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); \n\
263261 color: %2; \n\
264262 visible: titleLabel.visible && titleLabel.text; \n\
265263 text: cardData && cardData["subtitle"] || ""; \n\
266264 font.weight: Font.Light; \n\
267− horizontalAlignment: root.headerAlignment; \n\
268265 }\n';
269266
270267// %1 is used as anchors of attributesRow
@@ -310,7 +307,7 @@ function cardString(template, components) {
310307 property var artShapeBorderSource: undefined; \n\
311308 property real fontScale: 1.0; \n\
312309 property var scopeStyle: null; \n\
313− property int headerAlignment: Text.AlignLeft; \n\
310+ property int titleAlignment: Text.AlignLeft; \n\
314311 property int fixedHeaderHeight: -1; \n\
315312 property size fixedArtShapeSize: Qt.size(-1, -1); \n\
316313 readonly property string title: cardData && cardData["title"] || ""; \n\
@@ -436,18 +433,18 @@ function cardString(template, components) {
436433 mascotShapeCode = kMascotShapeLoaderCode.arg(mascotAnchors);
437434 }
438435
439− var mascotImageVisible = useMascotShape ? 'false' : 'showHeader';
436+ var mascotImageVisible = useMascotShape ? 'false' : 'showHeader && resized';
440437 mascotCode = kMascotImageCode.arg(mascotAnchors).arg(mascotImageVisible);
441438 }
442439
443− var summaryColorWithBackground = 'backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white")';
440+ var summaryColorWithBackground = 'backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white")';
444441
445442 var hasTitleContainer = hasTitle && (hasEmblem || (hasMascot && (hasSubtitle || hasAttributes)));
446443 var titleSubtitleCode = '';
447444 if (hasTitle) {
448445 var titleColor;
449446 if (headerAsOverlay) {
450− titleColor = 'root.scopeStyle ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white")';
447+ titleColor = 'root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white")';
451448 } else if (hasSummary) {
452449 titleColor = 'summary.color';
453450 } else if (hasBackground) {
@@ -655,6 +652,8 @@ function cardString(template, components) {
655652function createCardComponent(parent, template, components) {
656653 var imports = 'import QtQuick 2.2; \n\
657654 import Ubuntu.Components 1.1; \n\
655+ import Ubuntu.Settings.Components 0.1; \n\
656+ import Ubuntu.Connectivity 1.0; \n\
658657 import Dash 0.1;\n\
659658 import Utils 0.1;\n';
660659 var card = cardString(template, components);
plugins/Dash/CroppedImageMinimumSourceSize.qmlnew file+38
@@ -0,0 +1,38 @@
1+/*
2+ * Copyright (C) 2014 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+import QtQuick 2.3
18+
19+Image {
20+ property bool resized: false
21+ property bool resizing: false
22+ fillMode: Image.PreserveAspectCrop
23+ visible: resized
24+ onSourceSizeChanged: {
25+ if (!resized && !resizing) {
26+ resizing = true;
27+ var ar = width / height;
28+ var ssar = sourceSize.width / sourceSize.height;
29+ if (ar > ssar) {
30+ sourceSize = Qt.size(width, 0);
31+ } else {
32+ sourceSize = Qt.size(0, height);
33+ }
34+ resizing = false;
35+ resized = true;
36+ }
37+ }
38+}
plugins/Dash/listviewwithpageheader.cpp+36−12
@@ -104,8 +104,6 @@
104104#pragma GCC diagnostic pop
105105// #include <private/qquickrectangle_p.h>
106106
107−static const qreal bufferRatio = 0.5;
108−
109107qreal ListViewWithPageHeader::ListItem::height() const
110108{
111109 return m_item->height() + (m_sectionItem ? m_sectionItem->height() : 0);
@@ -158,6 +156,7 @@ ListViewWithPageHeader::ListViewWithPageHeader()
158156 , m_forceNoClip(false)
159157 , m_inLayout(false)
160158 , m_inContentHeightKeepHeaderShown(false)
159+ , m_cacheBuffer(0)
161160{
162161 m_clipItem = new QQuickItem(contentItem());
163162// m_clipItem = new QQuickRectangle(contentItem());
@@ -172,7 +171,7 @@ ListViewWithPageHeader::ListViewWithPageHeader()
172171 connect(this, SIGNAL(contentWidthChanged()), this, SLOT(onContentWidthChanged()));
173172 connect(this, SIGNAL(contentHeightChanged()), this, SLOT(onContentHeightChanged()));
174173 connect(this, SIGNAL(heightChanged()), this, SLOT(onHeightChanged()));
175− connect(m_contentYAnimation, SIGNAL(stopped()), this, SLOT(onShowHeaderAnimationFinished()));
174+ connect(m_contentYAnimation, SIGNAL(runningChanged(bool)), this, SLOT(contentYAnimationRunningChanged(bool)));
176175
177176 setFlickableDirection(VerticalFlick);
178177}
@@ -335,6 +334,20 @@ qreal ListViewWithPageHeader::headerItemShownHeight() const
335334 return m_headerItemShownHeight;
336335}
337336
337+qreal ListViewWithPageHeader::cacheBuffer() const
338+{
339+ return m_cacheBuffer;
340+}
341+
342+void ListViewWithPageHeader::setCacheBuffer(qreal cacheBuffer)
343+{
344+ if (cacheBuffer != m_cacheBuffer) {
345+ m_cacheBuffer = cacheBuffer;
346+ Q_EMIT cacheBufferChanged();
347+ polish();
348+ }
349+}
350+
338351void ListViewWithPageHeader::positionAtBeginning()
339352{
340353 if (m_delegateModel->count() <= 0)
@@ -356,8 +369,7 @@ void ListViewWithPageHeader::positionAtBeginning()
356369 // Create the subsequent items
357370 int modelIndex = 1;
358371 qreal pos = item->y() + item->height();
359− const qreal buffer = height() * bufferRatio;
360− const qreal bufferTo = height() + buffer;
372+ const qreal bufferTo = height() + m_cacheBuffer;
361373 while (modelIndex < m_delegateModel->count() && pos <= bufferTo) {
362374 if (!(item = createItem(modelIndex, false)))
363375 break;
@@ -409,6 +421,16 @@ void ListViewWithPageHeader::showHeader()
409421 }
410422}
411423
424+int ListViewWithPageHeader::firstCreatedIndex() const
425+{
426+ return m_firstVisibleIndex;
427+}
428+
429+int ListViewWithPageHeader::createdItemCount() const
430+{
431+ return m_visibleItems.count();
432+}
433+
412434QQuickItem *ListViewWithPageHeader::item(int modelIndex) const
413435{
414436 ListItem *item = itemAtIndex(modelIndex);
@@ -520,7 +542,7 @@ void ListViewWithPageHeader::adjustHeader(qreal diff)
520542 // (but the header was not shown by it's own position)
521543 // or the header is partially shown and we are not doing a maximizeVisibleArea either
522544 const bool scrolledUp = m_previousContentY > contentY();
523− const bool notRebounding = contentY() + height() < contentHeight();
545+ const bool notRebounding = qRound(contentY() + height()) < qRound(contentHeight());
524546 const bool notShownByItsOwn = contentY() + diff >= m_headerItem->y() + m_headerItem->height();
525547 const bool maximizeVisibleAreaRunning = m_contentYAnimation->isRunning() && contentYAnimationType == ContentYAnimationMaximizeVisibleArea;
526548
@@ -593,11 +615,10 @@ void ListViewWithPageHeader::refill()
593615 return;
594616 }
595617
596− const qreal buffer = height() * bufferRatio;
597618 const qreal from = contentY();
598619 const qreal to = from + height();
599− const qreal bufferFrom = from - buffer;
600− const qreal bufferTo = to + buffer;
620+ const qreal bufferFrom = from - m_cacheBuffer;
621+ const qreal bufferTo = to + m_cacheBuffer;
601622
602623 bool added = addVisibleItems(from, to, false);
603624 bool removed = removeNonVisibleItems(bufferFrom, bufferTo);
@@ -1056,10 +1077,13 @@ void ListViewWithPageHeader::onModelUpdated(const QQmlChangeSet &changeSet, bool
10561077 m_contentHeightDirty = true;
10571078}
10581079
1059−void ListViewWithPageHeader::onShowHeaderAnimationFinished()
1080+void ListViewWithPageHeader::contentYAnimationRunningChanged(bool running)
10601081{
1061− m_contentHeightDirty = true;
1062− polish();
1082+ setInteractive(!running);
1083+ if (!running) {
1084+ m_contentHeightDirty = true;
1085+ polish();
1086+ }
10631087}
10641088
10651089void ListViewWithPageHeader::itemGeometryChanged(QQuickItem * /*item*/, const QRectF &newGeometry, const QRectF &oldGeometry)
plugins/Dash/listviewwithpageheader.h+9−1
@@ -54,6 +54,7 @@ class ListViewWithPageHeader : public QQuickFlickable, public QQuickItemChangeLi
5454 Q_PROPERTY(bool forceNoClip READ forceNoClip WRITE setForceNoClip NOTIFY forceNoClipChanged)
5555 Q_PROPERTY(int stickyHeaderHeight READ stickyHeaderHeight NOTIFY stickyHeaderHeightChanged)
5656 Q_PROPERTY(qreal headerItemShownHeight READ headerItemShownHeight NOTIFY headerItemShownHeightChanged)
57+ Q_PROPERTY(qreal cacheBuffer READ cacheBuffer WRITE setCacheBuffer NOTIFY cacheBufferChanged)
5758
5859 friend class ListViewWithPageHeaderTest;
5960 friend class ListViewWithPageHeaderTestSection;
@@ -84,8 +85,13 @@ public:
8485 int stickyHeaderHeight() const;
8586 qreal headerItemShownHeight() const;
8687
88+ qreal cacheBuffer() const;
89+ void setCacheBuffer(qreal cacheBuffer);
90+
8791 Q_INVOKABLE void positionAtBeginning();
8892 Q_INVOKABLE void showHeader();
93+ Q_INVOKABLE int firstCreatedIndex() const;
94+ Q_INVOKABLE int createdItemCount() const;
8995 Q_INVOKABLE QQuickItem *item(int modelIndex) const;
9096
9197 // The index has to be created for this to try to do something
@@ -103,6 +109,7 @@ Q_SIGNALS:
103109 void forceNoClipChanged();
104110 void stickyHeaderHeightChanged();
105111 void headerItemShownHeightChanged();
112+ void cacheBufferChanged();
106113
107114protected:
108115 void componentComplete() override;
@@ -118,7 +125,7 @@ private Q_SLOTS:
118125 void onContentWidthChanged();
119126 void onHeightChanged();
120127 void onModelUpdated(const QQmlChangeSet &changeSet, bool reset);
121− void onShowHeaderAnimationFinished();
128+ void contentYAnimationRunningChanged(bool running);
122129
123130private:
124131 class ListItem
@@ -197,6 +204,7 @@ private:
197204 bool m_forceNoClip;
198205 bool m_inLayout;
199206 bool m_inContentHeightKeepHeaderShown;
207+ qreal m_cacheBuffer;
200208
201209 // Qt 5.0 doesn't like releasing the items just after itemCreated
202210 // so we delay the releasing until the next updatePolish
plugins/Dash/qmldir+2−1
@@ -3,4 +3,5 @@ plugin Dash-qml
33typeinfo Dash.qmltypes
44singleton CardCreatorCache 0.1 CardCreatorCache.qml
55ScopeStyle 0.1 ScopeStyle.qml
6−CardAttributes 0.1 CardAttributes.qml
6+CardAttributes 0.1 CardAttributes.qml
7+CroppedImageMinimumSourceSize 0.1 CroppedImageMinimumSourceSize.qml
plugins/LightDM/DBusGreeter.cpp+5
@@ -39,6 +39,11 @@ void DBusGreeter::ShowGreeter()
3939 return Q_EMIT m_greeter->showGreeter();
4040}
4141
42+void DBusGreeter::HideGreeter()
43+{
44+ return Q_EMIT m_greeter->hideGreeter();
45+}
46+
4247void DBusGreeter::isActiveChangedHandler()
4348{
4449 notifyPropertyChanged("IsActive", isActive());
plugins/LightDM/DBusGreeter.h+1−1
@@ -21,7 +21,6 @@
2121#include <QObject>
2222
2323class Greeter;
24−class QDBusInterface;
2524
2625/** This is an internal class used to talk with the indicators.
2726 */
@@ -38,6 +37,7 @@ public:
3837
3938 bool isActive() const;
4039 Q_SCRIPTABLE void ShowGreeter(); // temporary, until we split the greeter again
40+ Q_SCRIPTABLE void HideGreeter(); // temporary, until we split the greeter again
4141
4242Q_SIGNALS:
4343 void isActiveChanged();
plugins/LightDM/DBusGreeterList.h−1
@@ -21,7 +21,6 @@
2121#include <QObject>
2222
2323class Greeter;
24−class QDBusInterface;
2524
2625/** This is an internal class used to talk with the indicators.
2726 */
plugins/LightDM/Greeter.h+1
@@ -62,6 +62,7 @@ Q_SIGNALS:
6262 void isAuthenticatedChanged();
6363 void promptlessChanged();
6464 void showGreeter();
65+ void hideGreeter();
6566
6667 // This signal is emitted by external agents like indicators, and the UI
6768 // should switch to this user if possible.
plugins/LightDM/LightDM.qmltypes+2
@@ -27,6 +27,7 @@ Module {
2727 name: "showPrompt"
2828 Parameter { name: "text"; type: "string" }
2929 Parameter { name: "isSecret"; type: "bool" }
30+ Parameter { name: "isDefaultPrompt"; type: "bool" }
3031 }
3132 Signal { name: "authenticationComplete" }
3233 Signal {
@@ -34,6 +35,7 @@ Module {
3435 Parameter { name: "user"; type: "string" }
3536 }
3637 Signal { name: "isActiveChanged" }
38+ Signal { name: "isAuthenticatedChanged" }
3739 Signal { name: "showGreeter" }
3840 Signal {
3941 name: "requestAuthenticationUser"
plugins/Lights/Lights.cpp+1−2
@@ -20,8 +20,7 @@
2020#include <QtCore/QDebug>
2121
2222extern "C" {
23−#include <hardware/hardware.h>
24−#include <hardware/lights.h>
23+#include "android-hardware.h"
2524#include <string.h>
2625}
2726
plugins/Lights/android-hardware.hnew file+23
@@ -0,0 +1,23 @@
1+/*
2+ * Copyright (C) 2014 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ *
16+ */
17+
18+// The purpose of this header wrapper is just to avoid having warnings being reported on
19+// code from external header files, as we can't do anything about them.
20+#pragma GCC system_header
21+
22+#include <hardware/hardware.h>
23+#include <hardware/lights.h>
plugins/Powerd/Powerd.cpp+16−2
@@ -39,7 +39,8 @@ void dimTimeoutChanged(GSettings *settings, const gchar *key, QDBusInterface *un
3939
4040Powerd::Powerd(QObject* parent)
4141 : QObject(parent),
42− unityScreen(nullptr)
42+ unityScreen(nullptr),
43+ cachedStatus(Status::On)
4344{
4445 unityScreen = new QDBusInterface("com.canonical.Unity.Screen",
4546 "/com/canonical/Unity/Screen",
@@ -51,7 +52,7 @@ Powerd::Powerd(QObject* parent)
5152 "com.canonical.Unity.Screen",
5253 "DisplayPowerStateChange",
5354 this,
54− SIGNAL(displayPowerStateChange(int, int)));
55+ SLOT(handleDisplayPowerStateChange(int, int)));
5556
5657 systemSettings = g_settings_new("com.ubuntu.touch.system");
5758 g_signal_connect(systemSettings, "changed::auto-brightness", G_CALLBACK(autoBrightnessChanged), unityScreen);
@@ -67,3 +68,16 @@ Powerd::~Powerd()
6768 g_signal_handlers_disconnect_by_data(systemSettings, unityScreen);
6869 g_object_unref(systemSettings);
6970}
71+
72+Powerd::Status Powerd::status() const
73+{
74+ return cachedStatus;
75+}
76+
77+void Powerd::handleDisplayPowerStateChange(int status, int reason)
78+{
79+ if (cachedStatus != (Status)status) {
80+ cachedStatus = (Status)status;
81+ Q_EMIT statusChanged((DisplayStateChangeReason)reason);
82+ }
83+}
plugins/Powerd/Powerd.h+8−1
@@ -29,6 +29,7 @@ class Powerd: public QObject
2929 Q_OBJECT
3030 Q_ENUMS(Status)
3131 Q_ENUMS(DisplayStateChangeReason)
32+ Q_PROPERTY(Status status READ status NOTIFY statusChanged)
3233
3334public:
3435 enum DisplayStateChangeReason {
@@ -46,12 +47,18 @@ public:
4647 explicit Powerd(QObject *parent = 0);
4748 ~Powerd();
4849
50+ Status status() const;
51+
4952Q_SIGNALS:
50− void displayPowerStateChange(int status, int reason);
53+ void statusChanged(DisplayStateChangeReason reason);
54+
55+private Q_SLOTS:
56+ void handleDisplayPowerStateChange(int status, int reason);
5157
5258private:
5359 QDBusInterface *unityScreen;
5460 GSettings *systemSettings;
61+ Status cachedStatus;
5562};
5663
5764#endif
plugins/Powerd/Powerd.qmltypes+3−3
@@ -30,10 +30,10 @@ Module {
3030 "On": 1
3131 }
3232 }
33+ Property { name: "status"; type: "Status"; isReadonly: true }
3334 Signal {
34− name: "displayPowerStateChange"
35− Parameter { name: "status"; type: "int" }
36− Parameter { name: "reason"; type: "int" }
35+ name: "statusChanged"
36+ Parameter { name: "reason"; type: "DisplayStateChangeReason" }
3737 }
3838 }
3939}
plugins/Ubuntu/Payments/Payments.cpp+21−1
@@ -41,13 +41,23 @@ static void observer(PayPackage* /* package */, const char* itemid, PayPackageIt
4141 case PAY_PACKAGE_ITEM_STATUS_PURCHASED:
4242 Q_EMIT self->purchaseCompleted();
4343 break;
44+ case PAY_PACKAGE_ITEM_STATUS_PURCHASING:
45+ self->setPurchasing(true);
46+ break;
47+ case PAY_PACKAGE_ITEM_STATUS_NOT_PURCHASED:
48+ if (self->purchasing()) {
49+ self->setPurchasing(false);
50+ Q_EMIT self->purchaseCancelled();
51+ }
52+ break;
4453 default:
4554 break;
4655 }
4756}
4857
4958Payments::Payments(QObject *parent)
50− : QObject(parent)
59+ : QObject(parent),
60+ m_purchasing(false)
5161{
5262 m_package = pay_package_new("click-scope");
5363 pay_package_item_observer_install(m_package, observer, this);
@@ -80,6 +90,11 @@ QString Payments::formattedPrice() const
8090 return locale.toCurrencyString(m_price, m_currency);
8191}
8292
93+bool Payments::purchasing() const
94+{
95+ return m_purchasing;
96+}
97+
8398void Payments::setCurrency(const QString &currency)
8499{
85100 if(m_currency != currency) {
@@ -112,6 +127,11 @@ void Payments::setStoreItemId(const QString &store_item_id)
112127 pay_package_item_start_verification(m_package, m_store_item_id.toLocal8Bit().data());
113128}
114129
130+void Payments::setPurchasing(bool is_purchasing)
131+{
132+ m_purchasing = is_purchasing;
133+}
134+
115135void Payments::start()
116136{
117137 pay_package_item_start_purchase(m_package, m_store_item_id.toLocal8Bit().data());
plugins/Ubuntu/Payments/Payments.h+4
@@ -39,10 +39,12 @@ public:
3939 double price() const;
4040 QString storeItemId() const;
4141 QString formattedPrice() const;
42+ bool purchasing() const;
4243
4344 void setCurrency(const QString& currency);
4445 void setPrice(const double price);
4546 void setStoreItemId(const QString& store_item_id);
47+ void setPurchasing(bool is_purchasing);
4648 Q_INVOKABLE void start();
4749
4850Q_SIGNALS:
@@ -53,11 +55,13 @@ Q_SIGNALS:
5355
5456 void purchaseError(const QString &error);
5557 void purchaseCompleted();
58+ void purchaseCancelled();
5659
5760private:
5861 QString m_currency;
5962 double m_price;
6063 QString m_store_item_id;
64+ bool m_purchasing;
6165
6266 PayPackage *m_package;
6367};
plugins/Ubuntu/SystemImage/SystemImage.qmltypes+2
@@ -11,6 +11,8 @@ Module {
1111 name: "SystemImage"
1212 prototype: "QObject"
1313 exports: ["Ubuntu.SystemImage/SystemImage 0.1"]
14+ isCreatable: false
15+ isSingleton: true
1416 exportMetaObjectRevisions: [0]
1517 Method { name: "factoryReset" }
1618 }
plugins/Unity/DashCommunicator/CMakeLists.txt+8−2
@@ -1,5 +1,6 @@
11include_directories(
22 ${CMAKE_CURRENT_SOURCE_DIR}
3+ ${libunity8-private_SOURCE_DIR}
34)
45
56set(QMLDASHCOMMUNICATORPLUGIN_SRC
@@ -7,13 +8,18 @@ set(QMLDASHCOMMUNICATORPLUGIN_SRC
78 dbusdashcommunicatorservice.cpp
89 dashcommunicatorservice.cpp
910 dashcommunicator.cpp
10− )
11+ dashconnection.cpp
12+)
1113
1214add_library(DashCommunicator-qml MODULE
1315 ${QMLDASHCOMMUNICATORPLUGIN_SRC}
14− )
16+)
1517
1618qt5_use_modules(DashCommunicator-qml DBus Qml)
1719
20+target_link_libraries(DashCommunicator-qml
21+ unity8-private
22+)
23+
1824# export the qmldir and qmltypes files
1925add_unity8_plugin(Unity.DashCommunicator 0.1 Unity/DashCommunicator TARGETS DashCommunicator-qml)
plugins/Unity/DashCommunicator/dashcommunicator.cpp+22−13
@@ -15,29 +15,38 @@
1515 */
1616
1717#include "dashcommunicator.h"
18+#include "dashconnection.h"
1819
1920#include <QObject>
20−#include <QDBusConnection>
21−#include <QDBusInterface>
22−#include <QDebug>
2321
2422DashCommunicator::DashCommunicator(QObject *parent):
25− QObject(parent)
23+ QThread(parent),
24+ m_dashConnection(nullptr),
25+ m_created(false)
2626{
27+ start();
2728}
2829
29−DashCommunicator::~DashCommunicator()
30+void DashCommunicator::setCurrentScope(const QString &scopeId, bool animate, bool isSwipe)
3031{
32+ m_mutex.lock();
33+ if (m_created) {
34+ QMetaObject::invokeMethod(m_dashConnection, "setCurrentScope",
35+ Q_ARG(QString, scopeId),
36+ Q_ARG(bool, animate),
37+ Q_ARG(bool, isSwipe));
38+ }
39+ m_mutex.unlock();
3140}
3241
33−
34−void DashCommunicator::setCurrentScope(const QString &scopeId, bool animate, bool reset)
42+void DashCommunicator::run()
3543{
36− QDBusConnection connection = QDBusConnection::sessionBus();
37− QDBusInterface dashIface ("com.canonical.UnityDash",
38− "/com/canonical/UnityDash",
39− "",
40− connection);
44+ m_dashConnection = new DashConnection("com.canonical.UnityDash",
45+ "/com/canonical/UnityDash",
46+ "", this);
47+ m_mutex.lock();
48+ m_created = true;
49+ m_mutex.unlock();
4150
42− dashIface.call("SetCurrentScope", scopeId, animate, reset);
51+ exec();
4352}
plugins/Unity/DashCommunicator/dashcommunicator.h+17−7
@@ -17,19 +17,29 @@
1717#ifndef DASHCOMMUNICATOR_H
1818#define DASHCOMMUNICATOR_H
1919
20−#include <QObject>
20+// Qt
21+#include <QThread>
22+#include <QMutex>
2123
22−class DashCommunicator: public QObject
24+class DashConnection;
25+
26+class DashCommunicator: public QThread
2327{
2428 Q_OBJECT
25− Q_CLASSINFO("D-Bus Interface", "com.canonical.Unity.DashCommunicator")
26−
2729public:
28− DashCommunicator(QObject *parent = 0);
29− ~DashCommunicator();
30+ explicit DashCommunicator(QObject *parent = 0);
31+ ~DashCommunicator() = default;
3032
3133public Q_SLOTS:
32− void setCurrentScope(const QString &scopeId, bool animate, bool reset);
34+ void setCurrentScope(const QString &scopeId, bool animate, bool isSwipe);
35+
36+protected:
37+ void run() override;
38+
39+private:
40+ DashConnection *m_dashConnection;
41+ bool m_created;
42+ QMutex m_mutex;
3343};
3444
3545#endif
plugins/Unity/DashCommunicator/dashcommunicatorservice.h+1−1
@@ -29,7 +29,7 @@ public:
2929 ~DashCommunicatorService();
3030
3131Q_SIGNALS:
32− void setCurrentScopeRequested(const QString &scopeId, bool animate, bool reset);
32+ void setCurrentScopeRequested(const QString &scopeId, bool animate, bool isSwipe);
3333
3434private:
3535 DBusDashCommunicatorService *m_dbusService;
plugins/Unity/DashCommunicator/dashconnection.cppnew file+33
@@ -0,0 +1,33 @@
1+/*
2+ * Copyright (C) 2014 Canonical, Ltd.
3+ *
4+ * This program is free software: you can redistribute it and/or modify it under
5+ * the terms of the GNU Lesser General Public License version 3, as published by
6+ * the Free Software Foundation.
7+ *
8+ * This program is distributed in the hope that it will be useful, but WITHOUT
9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11+ * Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#include "dashconnection.h"
18+
19+#include <QDBusInterface>
20+#include <QDBusPendingCall>
21+
22+DashConnection::DashConnection(const QString &service, const QString &path, const QString &interface, QObject *parent):
23+ AbstractDBusServiceMonitor(service, path, interface, SessionBus, parent)
24+{
25+
26+}
27+
28+void DashConnection::setCurrentScope(const QString &scopeId, bool animate, bool isSwipe)
29+{
30+ if (dbusInterface()) {
31+ dbusInterface()->asyncCall("SetCurrentScope", scopeId, animate, isSwipe);
32+ }
33+}
plugins/Unity/DashCommunicator/dashconnection.hnew file+34
@@ -0,0 +1,34 @@
1+/*
2+ * Copyright (C) 2014 Canonical, Ltd.
3+ *
4+ * This program is free software: you can redistribute it and/or modify it under
5+ * the terms of the GNU Lesser General Public License version 3, as published by
6+ * the Free Software Foundation.
7+ *
8+ * This program is distributed in the hope that it will be useful, but WITHOUT
9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11+ * Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#ifndef THREADEDDASHCONNECTION_H
18+#define THREADEDDASHCONNECTION_H
19+
20+// local
21+#include "abstractdbusservicemonitor.h"
22+
23+
24+class DashConnection: public AbstractDBusServiceMonitor
25+{
26+ Q_OBJECT
27+public:
28+ DashConnection(const QString &service, const QString &path, const QString &interface, QObject *parent = 0);
29+
30+public Q_SLOTS:
31+ void setCurrentScope(const QString &scopeId, bool animate, bool isSwipe);
32+};
33+
34+#endif
plugins/Unity/DashCommunicator/dbusdashcommunicatorservice.cpp+2−2
@@ -33,7 +33,7 @@ DBusDashCommunicatorService::~DBusDashCommunicatorService()
3333{
3434}
3535
36−void DBusDashCommunicatorService::SetCurrentScope(const QString &scopeId, bool animate, bool reset)
36+void DBusDashCommunicatorService::SetCurrentScope(const QString &scopeId, bool animate, bool isSwipe)
3737{
38− Q_EMIT setCurrentScopeRequested(scopeId, animate, reset);
38+ Q_EMIT setCurrentScopeRequested(scopeId, animate, isSwipe);
3939}
plugins/Unity/DashCommunicator/dbusdashcommunicatorservice.h+2−2
@@ -29,10 +29,10 @@ public:
2929 ~DBusDashCommunicatorService();
3030
3131Q_SIGNALS:
32− void setCurrentScopeRequested(const QString &scopeId, bool animate, bool reset);
32+ void setCurrentScopeRequested(const QString &scopeId, bool animate, bool isSwipe);
3333
3434public Q_SLOTS:
35− Q_SCRIPTABLE void SetCurrentScope(const QString &scopeId, bool animate, bool reset);
35+ Q_SCRIPTABLE void SetCurrentScope(const QString &scopeId, bool animate, bool isSwipe);
3636
3737};
3838
plugins/Unity/Indicators/CMakeLists.txt−9
@@ -30,16 +30,7 @@ set(IndicatorsQML_SOURCES
3030)
3131add_definitions(-DUNITYINDICATORS_LIBRARY)
3232
33−set(IndicatorsQML_RESOURCES
34− resources/indicators.qrc
35−)
36−
37−qt5_add_resources(IndicatorsQML_RESOURCES_RCC
38− ${IndicatorsQML_RESOURCES}
39−)
40−
4133add_library(IndicatorsQml SHARED
42− ${IndicatorsQML_RESOURCES_RCC}
4334 ${IndicatorsQML_SOURCES}
4435)
4536
plugins/Unity/Indicators/Indicators.qmltypes+6−4
@@ -219,12 +219,14 @@ Module {
219219 Method {
220220 name: "model"
221221 type: "UnityMenuModel*"
222− Parameter { name: "path"; type: "string" }
222+ Parameter { name: "bus"; type: "QByteArray" }
223+ Parameter { name: "path"; type: "QByteArray" }
224+ Parameter { name: "actions"; type: "QVariantMap" }
223225 }
224226 Method {
225− name: "registerModel"
226− Parameter { name: "path"; type: "string" }
227− Parameter { name: "menuModel"; type: "UnityMenuModel"; isPointer: true }
227+ name: "contains"
228+ type: "bool"
229+ Parameter { name: "path"; type: "QByteArray" }
228230 }
229231 }
230232 Component {
plugins/Unity/Indicators/plugin.cpp−2
@@ -42,8 +42,6 @@ static QObject* menuModelCacheSingleton(QQmlEngine* engine, QJSEngine* scriptEng
4242
4343void Indicators2Plugin::registerTypes(const char *uri)
4444{
45− Q_INIT_RESOURCE(indicators);
46−
4745 qmlRegisterType<IndicatorsManager>(uri, 0, 1, "IndicatorsManager");
4846 qmlRegisterType<IndicatorsModel>(uri, 0, 1, "IndicatorsModel");
4947 qmlRegisterType<MenuContentActivator>(uri, 0, 1, "MenuContentActivator");
plugins/Unity/Indicators/resources/artwork/messaging/default_app.svgdeleted−42
@@ -1,42 +0,0 @@
1−<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2−<!-- Created with Inkscape (http://www.inkscape.org/) -->
3−<svg id="svg15137" xmlns="http://www.w3.org/2000/svg" height="48" width="48" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink">
4− <defs id="defs15139">
5− <radialGradient id="radialGradient2612" gradientUnits="userSpaceOnUse" cy="4.625" cx="62.625" gradientTransform="matrix(1 0 0 .34118 0 3.0471)" r="10.625">
6− <stop id="stop8840" offset="0"/>
7− <stop id="stop8842" style="stop-opacity:0" offset="1"/>
8− </radialGradient>
9− <linearGradient id="linearGradient15133" y2=".24326" gradientUnits="userSpaceOnUse" x2="62.2" gradientTransform="matrix(2.1499 0 0 2.1499 -110.12 31.935)" y1="-12.489" x1="62.2">
10− <stop id="stop4875" style="stop-color:#fff" offset="0"/>
11− <stop id="stop4877" style="stop-color:#fff;stop-opacity:0" offset="1"/>
12− </linearGradient>
13− <radialGradient id="radialGradient15127" gradientUnits="userSpaceOnUse" cy="-8.7256" cx="62.2" gradientTransform="matrix(2.4129 0 0 2.413 -126.48 34.231)" r="9.7553">
14− <stop id="stop8649" style="stop-color:#8fb1dc" offset="0"/>
15− <stop id="stop8651" style="stop-color:#3465a4" offset="1"/>
16− </radialGradient>
17− <radialGradient id="radialGradient2418" gradientUnits="userSpaceOnUse" cy="24.149" cx="17.814" gradientTransform="matrix(-2.644 0 2.9365e-8 2.5344 78.725 -37.986)" r="9.125">
18− <stop id="stop4847" style="stop-color:#fff" offset="0"/>
19− <stop id="stop4849" style="stop-color:#b6b6b6" offset="1"/>
20− </radialGradient>
21− <radialGradient id="radialGradient5145" gradientUnits="userSpaceOnUse" cy="13.067" cx="23.86" gradientTransform="matrix(-1.5425 0 0 -.84553 60.718 23.829)" r="18.098">
22− <stop id="stop14112" style="stop-color:#557695" offset="0"/>
23− <stop id="stop14114" style="stop-color:#15395c" offset="1"/>
24− </radialGradient>
25− <radialGradient id="radialGradient5147" gradientUnits="userSpaceOnUse" cy="-3.442" cx="62.225" gradientTransform="matrix(1.1035 0 0 1.0265 -4.1555 -1.8158)" r="10.081">
26− <stop id="stop14118" style="stop-color:#9e9e9e" offset="0"/>
27− <stop id="stop14120" style="stop-color:#9e9e9e;stop-opacity:0" offset="1"/>
28− </radialGradient>
29− </defs>
30− <g id="layer1">
31− <path id="path8836" style="opacity:.4;fill-rule:evenodd;fill:url(#radialGradient2612)" d="m73.25 4.625a10.625 3.625 0 1 1 -21.25 0 10.625 3.625 0 1 1 21.25 0z" transform="matrix(2.1647 0 0 2.5637 -111.56 26.85)"/>
32− <g id="g15122" transform="translate(.79042 -.78563)">
33− <path id="path6495" style="stroke:#204a87;fill:url(#radialGradient15127)" d="m43.505 24.387c0 10.99-8.9091 19.899-19.897 19.899-10.989 0-19.898-8.9091-19.898-19.899 0-10.989 8.9086-19.897 19.898-19.897 10.988 0 19.897 8.9081 19.897 19.897z"/>
34− <path id="path6534" style="stroke:url(#radialGradient5147);stroke-width:1.1035;fill:url(#radialGradient5145)" d="m23.726 5.3141c-1.5283 0.12067-3.0328 0.36544-4.4919 0.84567-1.23 0.48843 0.88689-0.42988-0.37486-0.60468-0.75942-0.12994-1.0776 0.65251-1.7561 0.67046-0.7741 0.023841-1.3048 0.71572-2.0319 0.79898-0.26187 1.4432-0.59924-0.56894-0.83949 0.13173 0.19047 0.7212-0.07796 1.1928-0.63582 1.6119-0.60156 0.68249-0.03584 1.2934 0.54212 0.69395 0.2775-0.83446 1.1825-1.7618 2.0655-1.2049 0.8837 0.48448 1.7582 1.6525 2.4938 0.40935-0.75488-0.090735-1.0462-0.73637-1.4079-1.2096-0.40023 0.031761-2.0794-0.32019-1.0059-0.24024 0.5284-0.17249 1.549-0.68558 1.9239-0.66537-0.94013 0.49026 0.35015 0.81268 0.73202 1.2035 0.68671 0.20357 0.99776 1.0757 0.37414 1.527-0.80181 0.4162 0.05573 1.1017 0.221 1.6748 0.12828 0.99827 0.99623 0.43282 1.2716-0.18046 0.39803-1.1153 1.6733-1.0767 2.5958-1.5522 1.008-0.51754 1.0248-0.53575 1.5034 0.20195 0.36764 0.21151 1.5947-0.55825 0.78901-0.929-0.68957 0.03713-1.142 0.46029-0.56364-0.60801 0.13915-0.57404 0.6791-1.3235 0.58092-1.7937-0.662-0.2603-1.324-0.5207-1.986-0.7811zm-9.3732 3.6945c0.35612 0.3643 1.5564 1.0234 1.4368 0.11255-0.14419-0.61744-1.0418-0.62308-1.4368-0.11255zm18.165-0.44471c-0.82412 0.16922-1.6412 0.35467-2.292 0.92363 0.19457 0.7853-0.8341 0.89786-1.2851 1.3281-0.12036 0.25242-0.02467 1.8403 0.51105 1.1573 0.58162-0.77246 0.83368 0.40868 1.4478 0.52687 0.4451-0.14324 0.5002-1.1438 0.33275-1.6043 0.28525-0.46984 0.75058-1.1195 1.3539-1.0659-0.37419 0.57099-0.80163 2.0315 0.3911 1.4345 0.34518-0.006-0.93958 0.75452-1.0166 1.273-0.48258 0.51284-0.9934 0.90587-1.6905 0.50847-0.33355-0.28162-0.50305-1.0992-0.71414-0.17566 0.43341 0.73252-1.089 0.04718-1.0514 1.0356-0.31972 0.61514-0.89623 0.8671-1.563 0.91149 0.24198 0.19141 1.1924 1.3314 0.24953 1.1701-0.60352 0.06628-1.4857 0.40701-1.2414 1.1653-0.27486 0.9444 0.4249 0.70654 0.85522 1.2977 0.70116-0.19916 1.1488-0.62908 1.2634-1.3621 0.65618-0.19273 0.73557-0.93195 1.456-0.91702 0.7182-0.40381 0.88559 0.73738 1.5587 0.82181 0.07058 0.4087-0.33464 1.281 0.45659 0.4693 0.76441-0.55387-0.79512-1.2716-0.30963-1.4066 0.69099 0.22071 0.94006 0.87671 1.051 1.519 0.56306 0.9634 0.70185 0.44404 0.74672-0.40362 0.87723-0.39439 1.1473 1.641 2.3881 1.1397 0.92678 0.19174 0.59949 0.8304-0.01904 1.2203-0.50066 0.47112-1.3382 0.17338-1.9265-0.01558-0.56472-0.27756-1.3196-0.24813-1.6214 0.38347-0.46529-0.21764-0.94642-0.91135-1.4178-1.3118-1.1647-0.5139-2.4314-0.07571-3.5919 0.23946-0.99563 1.1632-2.1949 2.219-2.6236 3.7359-0.62778 0.63853 0.54336 1.0082-0.24392 1.556-0.6428 0.51279 0.10805 1.1629 0.2458 1.7527 0.60445 0.74395 1.6306 3.0723 2.5708 2.1452 0.52705-0.80245 0.81963 0.61582 1.4399-0.30194 0.4952-0.39949 0.9695 0.45802 1.6897 0.14331 0.69372 0.4284 0.56095 1.0433 0.27484 1.6928 0.15583 0.54087 0.93098 0.9344 0.62978 1.6677-0.27366 0.68309 0.58312 1.201 0.41038 1.7987-0.5748 1.1512-0.43928 2.5747 0.09386 3.7157 0.42668 1.0325 0.67699 2.1484 0.64366 3.2692 0.74277 0.2222 1.1367-0.72912 1.8776-0.51313 0.72333 0.09324 0.99191-0.82974 1.5008-1.2158 0.56704-0.46747-0.07223-1.1873 0.82794-1.5185 0.87331-0.42523-1.106-1.0213 0.0152-1.4024 0.46515-0.51761 1.4132-0.69776 1.6008-1.3735-0.33834-1.0398-0.21797-2.1801-0.16738-3.2436 0.32552-0.84167 0.72975-1.6312 1.4262-2.2272 0.28082-0.92669 0.94924-1.7777 0.88942-2.7709-1.6476 0.50399-1.1482-0.21491-0.22962-0.87318 0.63508-0.42199 1.4051-0.84564 1.7006-1.5617 0.14435-0.81048-0.45227-2.1297-1.0079-0.90496-0.24511-0.4707-1.1542-0.71744-1.113-1.3307-0.17659-1.2625 0.34462-0.14427 0.86051 0.10789 1.1146-0.60521 1.6818 1.7766 2.3893 0.35503-0.618-4.471-3.052-8.528-6.34-11.567-0.571-1.0949-0.921 0.75-1.501 0.68-0.464-0.485-1.33-1.1394-0.122-0.914 1.034-0.3028 0.333-0.7027-0.425-0.6842-0.574-0.0697-1.101-0.2706-1.635-0.4789zm-20.56 0.4447c-0.275 1.3534-2.0109 1.1954-2.6162 2.5304-2.9783 3.153-4.8166 7.302-5.32 11.598 0.26584 1.0071 1.1105 1.4908 1.9601 1.9373 0.72184 0.41932 1.7801 0.2342 2.1848 1.1124 0.45187 0.36983 0.93948 1.0997 1.5856 0.87722 0.93664-0.09099 0.36019 0.85823 0.19973 1.3392-0.059277 0.607-0.80778 0.99372-0.52016 1.5778-0.24136 0.66166-0.43304 1.3177 0.10262 1.8906 0.45551 0.83988 0.82632 1.7478 1.6708 2.2751 0.59217 0.49728 1.2625 1.1553 1.0304 1.9974-0.12338 0.68167 0.04306 1.3099 0.3725 1.908-0.11816 0.67146-0.36073 1.3584-0.4105 2.0183 0.87949 0.62206 2.6705 2.0606 2.8031 0.49489 0.50176-0.45161 0.5321-1.1784 1.3743-1.1804 0.3909-0.47777 0.52549-1.2283 0.81706-1.8117-0.42572-0.5384 0.16631-1.3697 0.8046-1.3477 0.81594 0.06128 0.78593-0.89448 1.1111-1.4232-0.0073-0.77224-0.38892-1.6471 0.30542-2.227 0.52242-0.47344 0.46827-1.1675 0.5498-1.8097-1.171-0.7244-2.712-1.0911-3.6386-2.0687-0.18364-0.76504-0.7598-1.0229-1.4925-1.0784-0.30936-0.43256-0.25697-1.4628-0.79753-1.5131-0.69628 0.13369-1.3857 0.24089-1.8917-0.3644-0.573-0.776-1.069 0.2-1.593 0.546-0.492 0.856-1.8683-0.043-1.7038-1.007 0.4839-1.334-1.6425 0.148-0.7699-1.425 0.4151-1.715-0.7067-0.396-1.2952-0.011-0.71822 0.0081-0.98953-0.70747-0.86146-1.3625-0.091117-0.78733 0.48283-1.1877 1.0669-1.5822 0.78161 0.12038 0.97989-0.56085 1.5654-0.4722 0.73603-0.03767 1.0049 0.66782 1.4232 1.1357 0.17514-0.66797-0.18345-1.6152 0.55606-1.9879 0.56414-0.42781 1.137-0.84927 1.2721-1.5904 0.13304-0.77598 1.2893-0.46761 1.4837-1.2526 0.26877-0.8206 1.5114-0.15823 1.7899-0.96804 0.8733-0.82086-0.27242-0.57178-0.89854-0.59806-1.2353 0.12695 0.1228-0.32763 0.58598-0.58155 0.68608 0.09073 1.3195-0.13384 1.9499-0.37629 0.08445 0.85843 0.24597 1.3112 0.68417 0.30788-0.85421-0.20211-0.11618-1.0402-0.95973-1.2614-0.66764 0.04697 0.0066-1.4189-0.81571-1.2577-1.0697 0.70782-0.11401-0.50251-0.9854-0.66347-0.68736-0.74222-0.85436 0.47657-1.2276 0.9183 0.24207 0.84702-0.79095 0.66525-0.97976 1.3606-0.41814 1.2534-0.24143-0.08931-0.74055-0.41035-0.61653-0.24732-1.3592-0.3784-1.3637-1.1899 0.82658-0.60512 2.0667-0.96189 2.5994-1.9148 0.3095-0.74008-0.26215-1.1445-0.96618-1.0889l-0.000005-2e-7zm14.675 1.642c-0.12491 0.65746 0.5475 1.009 0.30788 1.7104-0.21487 0.76842-0.27728 1.3789 0.68289 0.93046 0.99668-0.51183 0.36052-0.90148-0.03867-1.5728-0.27187-0.44613-0.24574-1.275-0.9521-1.0681zm-0.75259 1.0947c-0.79414-0.24012-0.61745 1.4493-0.12164 1.0118 0.7276-0.17916 0.23703-0.5252 0.12164-1.0118zm10.023 8.9969c0.95184 0.84444 1.277 2.0946 1.8858 3.1596 0.90428 0.39972 0.0415 1.0795 0.44521 1.5712 0.84897 0.92228-1.1752 0.24516-0.90606-0.67899-0.1971-1.2139-1.0559-2.044-1.4678-3.1045-0.04294-0.3526-0.38552-0.71788 0.04284-0.94732z"/>
35− <path id="path8655" style="opacity:.4;stroke:url(#linearGradient15133);fill:none" d="m42.409 24.387c0 10.384-8.4184 18.803-18.801 18.803-10.384 0-18.802-8.4184-18.802-18.803 0-10.384 8.418-18.801 18.802-18.801 10.383 0 18.801 8.4175 18.801 18.801z"/>
36− </g>
37− <g id="g2414" transform="matrix(.99991 -.013701 .013701 .99991 -.28870 .53585)">
38− <path id="path3970" style="stroke-linejoin:round;fill-rule:evenodd;stroke:#666;fill:url(#radialGradient2418)" d="m30.5 20.937 17 16.5-7.75 0.25s3.25 6.75 3.25 6.75c1 3-3.5 4.125-4.25 1.875l-3-6.75-5.5 5.875 0.25-24.5z"/>
39− <path id="path4853" style="opacity:.4;stroke:#fff;fill:none" d="m31.657 23.379 13.476 13.186-6.9219 0.27746l3.8721 7.7566c0.40273 1.6501-2.0283 2.4126-2.5071 1.1529l-3.6831-7.845-4.4247 4.7083 0.18907-19.236z"/>
40− </g>
41− </g>
42−</svg>
plugins/Unity/Indicators/resources/artwork/messaging/default_contact.pngdeleted

Binary file not shown.

plugins/Unity/Indicators/resources/indicators.qrcdeleted−6
@@ -1,6 +0,0 @@
1−<RCC>
2− <qresource prefix="/indicators">
3− <file>artwork/messaging/default_contact.png</file>
4− <file>artwork/messaging/default_app.svg</file>
5− </qresource>
6−</RCC>
plugins/Unity/Launcher/CMakeLists.txt+7−5
@@ -1,6 +1,6 @@
11include(FindPkgConfig)
2−pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=3)
3−pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=3)
2+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=4)
3+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=5)
44pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
55
66add_definitions(-DSM_BUSNAME=systemBus)
@@ -16,8 +16,10 @@ set(QMLLAUNCHERPLUGIN_SRC
1616 launchermodel.cpp
1717 launcheritem.cpp
1818 quicklistmodel.cpp
19− common/quicklistentry.cpp
20− backend/launcherbackend.cpp
19+ quicklistentry.cpp
20+ dbusinterface.cpp
21+ gsettings.cpp
22+ desktopfilehandler.cpp
2123 ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp
2224 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
2325 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
@@ -30,6 +32,6 @@ add_library(UnityLauncher-qml MODULE
3032
3133target_link_libraries(UnityLauncher-qml ${GSETTINGS_QT_LDFLAGS})
3234
33−qt5_use_modules(UnityLauncher-qml DBus Qml)
35+qt5_use_modules(UnityLauncher-qml DBus Qml Gui)
3436
3537add_unity8_plugin(Unity.Launcher 0.1 Unity/Launcher TARGETS UnityLauncher-qml)
plugins/Unity/Launcher/backend/launcherbackend.cppdeleted−584
@@ -1,584 +0,0 @@
1−/*
2− * Copyright (C) 2013 Canonical, Ltd.
3− *
4− * Authors:
5− * Michael Terry <michael.terry@canonical.com>
6− * Michael Zanetti <michael.zanetti@canonical.com>
7− *
8− * This program is free software; you can redistribute it and/or modify
9− * it under the terms of the GNU General Public License as published by
10− * the Free Software Foundation; version 3.
11− *
12− * This program is distributed in the hope that it will be useful,
13− * but WITHOUT ANY WARRANTY; without even the implied warranty of
14− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15− * GNU General Public License for more details.
16− *
17− * You should have received a copy of the GNU General Public License
18− * along with this program. If not, see <http://www.gnu.org/licenses/>.
19− */
20−
21−#include "AccountsServiceDBusAdaptor.h"
22−#include "launcherbackend.h"
23−
24−#include <QDir>
25−#include <QDBusArgument>
26−#include <QFileInfo>
27−#include <QGSettings>
28−#include <QDebug>
29−#include <QStandardPaths>
30−
31−class LauncherBackendItem
32−{
33−public:
34− QString displayName;
35− QString icon;
36− int count;
37− bool countVisible;
38−};
39−
40−LauncherBackend::LauncherBackend(QObject *parent):
41− QDBusVirtualObject(parent),
42− m_accounts(nullptr)
43−{
44−#ifndef LAUNCHER_TESTING
45− m_accounts = new AccountsServiceDBusAdaptor(this);
46−#endif
47− m_user = qgetenv("USER");
48− syncFromAccounts();
49−
50− /* Set up ourselves on DBus */
51− QDBusConnection con = QDBusConnection::sessionBus();
52− if (!con.registerService("com.canonical.Unity.Launcher")) {
53− qDebug() << "Unable to register launcher name";
54− }
55− if (!con.registerVirtualObject("/com/canonical/Unity/Launcher", this, QDBusConnection::VirtualObjectRegisterOption::SubPath)) {
56− qDebug() << "Unable to register launcher object";
57− }
58−}
59−
60−LauncherBackend::~LauncherBackend()
61−{
62− /* Remove oursevles from DBus */
63− QDBusConnection con = QDBusConnection::sessionBus();
64− con.unregisterService("com.canonical.Unity.Launcher");
65− con.unregisterObject("/com/canonical/Unity/Launcher");
66−
67− /* Clear data */
68− m_storedApps.clear();
69−
70− Q_FOREACH(LauncherBackendItem *item, m_itemCache) {
71− delete item;
72− }
73− m_itemCache.clear();
74−}
75−
76−QStringList LauncherBackend::storedApplications() const
77−{
78− return m_storedApps;
79−}
80−
81−void LauncherBackend::setStoredApplications(const QStringList &appIds)
82−{
83− if (appIds.count() < m_storedApps.count()) {
84− Q_FOREACH(const QString &appId, m_storedApps) {
85− if (!appIds.contains(appId)) {
86− delete m_itemCache.take(appId);
87− }
88− }
89− }
90− m_storedApps = appIds;
91− Q_FOREACH(const QString &appId, appIds) {
92− if (!m_itemCache.contains(appId)) {
93− QString df = findDesktopFile(appId);
94− if (!df.isEmpty()) {
95− LauncherBackendItem *item = parseDesktopFile(df);
96− m_itemCache.insert(appId, item);
97− } else {
98− // Cannot find any data for that app... ignoring it.
99− qWarning() << "cannot find desktop file for" << appId << ". discarding app.";
100− m_storedApps.removeAll(appId);
101− }
102− }
103− }
104− syncToAccounts();
105−}
106−
107−QString LauncherBackend::desktopFile(const QString &appId) const
108−{
109− return findDesktopFile(appId);
110−}
111−
112−QString LauncherBackend::displayName(const QString &appId) const
113−{
114− LauncherBackendItem *item = m_itemCache.value(appId, nullptr);
115− if (item) {
116− return item->displayName;
117− }
118−
119− QString df = findDesktopFile(appId);
120− if (!df.isEmpty()) {
121− LauncherBackendItem *item = parseDesktopFile(df);
122− m_itemCache.insert(appId, item);
123− return item->displayName;
124− }
125−
126− return QString();
127−}
128−
129−QString LauncherBackend::icon(const QString &appId) const
130−{
131− QString iconName;
132− LauncherBackendItem *item = getItem(appId);
133− if (item) {
134− iconName = item->icon;
135− }
136−
137− return iconName;
138−}
139−
140−QList<QuickListEntry> LauncherBackend::quickList(const QString &appId) const
141−{
142− // TODO: Get static (from .desktop file) and dynamic (from the app itself)
143− // entries and return them here. Frontend related entries (like "Pin to launcher")
144− // don't matter here. This is just the backend part.
145− // TODO: emit quickListChanged() when the dynamic part changes
146− Q_UNUSED(appId)
147− return QList<QuickListEntry>();
148−}
149−
150−int LauncherBackend::progress(const QString &appId) const
151−{
152− // TODO: Return value for progress emblem.
153− // TODO: emit progressChanged() when this value changes.
154− Q_UNUSED(appId)
155− return -1;
156−}
157−
158−int LauncherBackend::count(const QString &appId) const
159−{
160− int count = -1;
161− LauncherBackendItem *item = getItem(appId);
162−
163− if (item) {
164− if (item->countVisible) {
165− count = item->count;
166− }
167− }
168−
169− return count;
170−}
171−
172−void LauncherBackend::setCount(const QString &appId, int count) const
173−{
174− LauncherBackendItem *item = getItem(appId);
175−
176− bool emitchange = false;
177− if (item) {
178− emitchange = (item->count != count);
179− item->count = count;
180− }
181−
182− if (emitchange) {
183− /* TODO: This needs to use the accessor to handle the visibility
184− correctly, but when we have the two properties we can just use
185− the local value */
186− Q_EMIT countChanged(appId, this->count(appId));
187− QVariant vcount(item->count);
188− emitPropChangedDbus(appId, "count", vcount);
189− }
190−}
191−
192−bool LauncherBackend::countVisible(const QString &appId) const
193−{
194− bool visible = false;
195− LauncherBackendItem *item = getItem(appId);
196−
197− if (item) {
198− visible = item->countVisible;
199− }
200−
201− return visible;
202−}
203−
204−void LauncherBackend::setCountVisible(const QString &appId, bool visible) const
205−{
206− LauncherBackendItem *item = getItem(appId);
207−
208− bool emitchange = false;
209− if (item) {
210− emitchange = (item->countVisible != visible);
211− item->countVisible = visible;
212− } else {
213− qDebug() << "Unable to find:" << appId;
214− }
215−
216− if (emitchange) {
217− /* TODO: Because we're using visible in determining the
218− count we need to emit a count changed as well */
219− Q_EMIT countChanged(appId, this->count(appId));
220− Q_EMIT countVisibleChanged(appId, item->countVisible);
221− QVariant vCountVisible(item->countVisible);
222− emitPropChangedDbus(appId, "countVisible", vCountVisible);
223− }
224−}
225−
226−void LauncherBackend::setUser(const QString &username)
227−{
228− if (qgetenv("USER") == "lightdm" && m_user != username) {
229− m_user = username;
230− syncFromAccounts();
231− }
232−}
233−
234−void LauncherBackend::triggerQuickListAction(const QString &appId, const QString &quickListId)
235−{
236− // TODO: execute the given quicklist action
237− Q_UNUSED(appId)
238− Q_UNUSED(quickListId)
239−}
240−
241−void LauncherBackend::syncFromAccounts()
242−{
243− QList<QVariantMap> apps;
244− bool defaults = true;
245−
246− m_storedApps.clear();
247−
248− if (m_accounts && !m_user.isEmpty()) {
249− QVariant variant = m_accounts->getUserProperty(m_user, "com.canonical.unity.AccountsService", "launcher-items");
250− if (variant.isValid() && variant.canConvert<QDBusArgument>()) {
251− apps = qdbus_cast<QList<QVariantMap>>(variant.value<QDBusArgument>());
252− defaults = isDefaultsItem(apps);
253− }
254− }
255−
256− if (m_accounts && defaults) { // Checking accounts as it'll be null when !useStorage
257− QGSettings gSettings("com.canonical.Unity.Launcher", "/com/canonical/unity/launcher/");
258− Q_FOREACH(const QString &entry, gSettings.get("favorites").toStringList()) {
259− if (entry.startsWith("application://")) {
260− QString appId = entry;
261− // Transform "application://foobar.desktop" to "application://foobar"
262− appId.remove("application://");
263− if (appId.endsWith(".desktop")) {
264− appId.chop(8);
265− }
266− QString df = findDesktopFile(appId);
267−
268− if (!df.isEmpty()) {
269− m_storedApps << appId;
270−
271− if (!m_itemCache.contains(appId)) {
272− m_itemCache.insert(appId, parseDesktopFile(df));
273− }
274− }
275− }
276− if (entry.startsWith("appid://")) {
277− QString appId = entry;
278− appId.remove("appid://");
279− // Strip hook name and current-user-version in case its there
280−
281− if (appId.split('/').count() != 3) {
282− qWarning() << "ignoring entry " + appId + ". Not a valid appId.";
283− continue;
284− }
285− appId = appId.split('/').first() + "_" + appId.split('/').at(1);
286− QString df = findDesktopFile(appId);
287−
288− if (!df.isEmpty()) {
289− m_storedApps << appId;
290−
291− if (!m_itemCache.contains(appId)) {
292− m_itemCache.insert(appId, parseDesktopFile(df));
293− }
294− }
295− }
296− }
297− } else {
298− for (const QVariant &app: apps) {
299− loadFromVariant(app.toMap());
300− }
301− }
302−}
303−
304−void LauncherBackend::syncToAccounts()
305−{
306− if (m_accounts && !m_user.isEmpty()) {
307− QList<QVariantMap> items;
308−
309− Q_FOREACH(const QString &appId, m_storedApps) {
310− items << itemToVariant(appId);
311− }
312−
313− m_accounts->setUserProperty(m_user, "com.canonical.unity.AccountsService", "launcher-items", QVariant::fromValue(items));
314− }
315−}
316−
317−QString LauncherBackend::findDesktopFile(const QString &appId) const
318−{
319− int dashPos = -1;
320− QString helper = appId;
321−
322− QStringList searchDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
323−#ifdef LAUNCHER_TESTING
324− searchDirs << "";
325−#endif
326−
327− do {
328− if (dashPos != -1) {
329− helper = helper.replace(dashPos, 1, '/');
330− }
331−
332− Q_FOREACH(const QString &searchDirName, searchDirs) {
333− QDir searchDir(searchDirName);
334− Q_FOREACH(const QString &desktopFile, searchDir.entryList(QStringList() << "*.desktop")) {
335− if (desktopFile.startsWith(helper)) {
336− QFileInfo fileInfo(searchDir, desktopFile);
337− return fileInfo.absoluteFilePath();
338− }
339− }
340− }
341−
342− dashPos = helper.indexOf("-");
343− } while (dashPos != -1);
344−
345− return QString();
346−}
347−
348−LauncherBackendItem* LauncherBackend::parseDesktopFile(const QString &desktopFile) const
349−{
350− QSettings settings(desktopFile, QSettings::IniFormat);
351−
352− LauncherBackendItem* item = new LauncherBackendItem();
353− item->displayName = settings.value("Desktop Entry/Name").toString();
354−
355− QString iconString = settings.value("Desktop Entry/Icon").toString();
356− QString pathString = settings.value("Desktop Entry/Path").toString();
357− if (QFileInfo(iconString).exists()) {
358− item->icon = QFileInfo(iconString).absoluteFilePath();
359− } else if (QFileInfo(pathString + '/' + iconString).exists()) {
360− item->icon = pathString + '/' + iconString;
361− } else {
362− item->icon = "image://theme/" + iconString;
363− }
364−
365− /* TODO: These should be looked up in a cache somewhere */
366− item->count = 0;
367− item->countVisible = false;
368−
369− return item;
370−}
371−
372−/* Gets an item, and tries to create a new one if we need it to */
373−LauncherBackendItem* LauncherBackend::getItem(const QString &appId) const
374−{
375− LauncherBackendItem *item = m_itemCache.value(appId, nullptr);
376− if (!item) {
377− QString df = findDesktopFile(appId);
378− if (!df.isEmpty()) {
379− item = parseDesktopFile(df);
380− if (item) {
381− m_itemCache[appId] = item;
382− } else {
383− qWarning() << "Unable to parse desktop file for" << appId << "path" << df;
384− }
385− } else {
386− qWarning() << "Unable to find desktop file for:" << appId;
387− }
388− }
389−
390− if (!item)
391− qWarning() << "Unable to find item for: " << appId;
392−
393− return item;
394−}
395−
396−void LauncherBackend::loadFromVariant(const QVariantMap &details)
397−{
398− if (!details.contains("id")) {
399− return;
400− }
401− QString appId = details.value("id").toString();
402−
403− LauncherBackendItem *item = m_itemCache.value(appId, nullptr);
404− if (item) {
405− delete item;
406− }
407−
408− item = new LauncherBackendItem();
409−
410− item->displayName = details.value("name").toString();
411− item->icon = details.value("icon").toString();
412− item->count = details.value("count").toInt();
413− item->countVisible = details.value("countVisible").toBool();
414−
415− m_itemCache.insert(appId, item);
416− m_storedApps.append(appId);
417−}
418−
419−QVariantMap LauncherBackend::itemToVariant(const QString &appId) const
420−{
421− LauncherBackendItem *item = m_itemCache.value(appId);
422− QVariantMap details;
423− details.insert("id", appId);
424− details.insert("name", item->displayName);
425− details.insert("icon", item->icon);
426− details.insert("count", item->count);
427− details.insert("countVisible", item->countVisible);
428− return details;
429−}
430−
431−bool LauncherBackend::isDefaultsItem(const QList<QVariantMap> &apps) const
432−{
433− // To differentiate between an empty list and a list that hasn't been set
434− // yet (and should thus be populated with the defaults), we use a special
435− // list of one item with the 'defaults' field set to true.
436− return (apps.size() == 1 && apps[0].value("defaults").toBool());
437−}
438−
439−bool LauncherBackend::handleMessage(const QDBusMessage& message, const QDBusConnection& connection)
440−{
441− /* Check to make sure we're getting properties on our interface */
442− if (message.type() != QDBusMessage::MessageType::MethodCallMessage) {
443− return false;
444− }
445− if (message.interface() != "org.freedesktop.DBus.Properties") {
446− return false;
447− }
448− if (message.arguments()[0].toString() != "com.canonical.Unity.Launcher.Item") {
449− return false;
450− }
451−
452− /* Break down the path to just the app id */
453− QString pathtemp = message.path();
454− if (!pathtemp.startsWith("/com/canonical/Unity/Launcher/")) {
455− return false;
456− }
457− pathtemp.remove("/com/canonical/Unity/Launcher/");
458− if (pathtemp.indexOf('/') >= 0) {
459− return false;
460− }
461−
462− /* Find ourselves an appid */
463− QString appid = decodeAppId(pathtemp);
464− QVariantList retval;
465−
466− if (message.member() == "Get") {
467− if (message.arguments()[1].toString() == "count") {
468− retval.append(QVariant::fromValue(QDBusVariant(this->count(appid))));
469− } else if (message.arguments()[1].toString() == "countVisible") {
470− retval.append(QVariant::fromValue(QDBusVariant(this->countVisible(appid))));
471− }
472− } else if (message.member() == "Set") {
473− if (message.arguments()[1].toString() == "count") {
474− this->setCount(appid, message.arguments()[2].value<QDBusVariant>().variant().toInt());
475− } else if (message.arguments()[1].toString() == "countVisible") {
476− this->setCountVisible(appid, message.arguments()[2].value<QDBusVariant>().variant().toBool());
477− }
478− } else if (message.member() == "GetAll") {
479− retval.append(this->itemToVariant(appid));
480− } else {
481− return false;
482− }
483−
484− QDBusMessage reply = message.createReply(retval);
485− return connection.send(reply);
486−}
487−
488−QString LauncherBackend::introspect(const QString &path) const
489−{
490− /* This case we should just list the nodes */
491− if (path == "/com/canonical/Unity/Launcher/" || path == "/com/canonical/Unity/Launcher") {
492− QString nodes;
493−
494− Q_FOREACH(const QString &appId, m_itemCache.keys()) {
495− nodes.append("<node name=\"");
496− nodes.append(encodeAppId(appId));
497− nodes.append("\"/>\n");
498− }
499−
500− return nodes;
501− }
502−
503− /* Should not happen, but let's handle it */
504− if (!path.startsWith("/com/canonical/Unity/Launcher")) {
505− return "";
506− }
507−
508− /* Now we should be looking at a node */
509− QString nodeiface =
510− "<interface name=\"com.canonical.Unity.Launcher.Item\">"
511− "<property name=\"count\" type=\"i\" access=\"readwrite\" />"
512− "<property name=\"countVisible\" type=\"b\" access=\"readwrite\" />"
513− "</interface>";
514− return nodeiface;
515−}
516−
517−QString LauncherBackend::decodeAppId(const QString& path)
518−{
519− QByteArray bytes = path.toUtf8();
520− QByteArray decoded;
521−
522− for (int i = 0; i < bytes.size(); ++i) {
523− char chr = bytes.at(i);
524−
525− if (chr == '_') {
526− QString number;
527− number.append(bytes.at(i+1));
528− number.append(bytes.at(i+2));
529−
530− bool okay;
531− char newchar = number.toUInt(&okay, 16);
532− if (okay)
533− decoded.append(newchar);
534−
535− i += 2;
536− } else {
537− decoded.append(chr);
538− }
539− }
540−
541− return QString::fromUtf8(decoded);
542−}
543−
544−QString LauncherBackend::encodeAppId(const QString& appId)
545−{
546− QByteArray bytes = appId.toUtf8();
547− QString encoded;
548−
549− for (int i = 0; i < bytes.size(); ++i) {
550− uchar chr = bytes.at(i);
551−
552− if ((chr >= 'a' && chr <= 'z') ||
553− (chr >= 'A' && chr <= 'Z') ||
554− (chr >= '0' && chr <= '9'&& i != 0)) {
555− encoded.append(chr);
556− } else {
557− QString hexval = QString("_%1").arg(chr, 2, 16, QChar('0'));
558− encoded.append(hexval.toUpper());
559− }
560− }
561−
562− return encoded;
563−}
564−
565−void LauncherBackend::emitPropChangedDbus(const QString& appId, const QString& property, QVariant &value) const
566−{
567− QString path("/com/canonical/Unity/Launcher/");
568− path.append(encodeAppId(appId));
569−
570− QDBusMessage message = QDBusMessage::createSignal(path, "org.freedesktop.DBus.Properties", "PropertiesChanged");
571−
572− QList<QVariant> arguments;
573− QVariantHash changedprops;
574− changedprops[property] = QVariant::fromValue(QDBusVariant(value));
575− QVariantList deletedprops;
576−
577− arguments.append(changedprops);
578− arguments.append(deletedprops);
579−
580− message.setArguments(arguments);
581−
582− QDBusConnection con = QDBusConnection::sessionBus();
583− con.send(message);
584−}
plugins/Unity/Launcher/backend/launcherbackend.hdeleted−196
@@ -1,196 +0,0 @@
1−/* Copyright (C) 2013 Canonical, Ltd.
2− *
3− * Authors:
4− * Michael Zanetti <michael.zanetti@canonical.com>
5− *
6− * This program is free software; you can redistribute it and/or modify
7− * it under the terms of the GNU General Public License as published by
8− * the Free Software Foundation; version 3.
9− *
10− * This program is distributed in the hope that it will be useful,
11− * but WITHOUT ANY WARRANTY; without even the implied warranty of
12− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13− * GNU General Public License for more details.
14− *
15− * You should have received a copy of the GNU General Public License
16− * along with this program. If not, see <http://www.gnu.org/licenses/>.
17− */
18−
19−#ifndef LAUNCHERBACKEND_H
20−#define LAUNCHERBACKEND_H
21−
22−#include "common/quicklistentry.h"
23−
24−#include <QObject>
25−#include <QSettings>
26−#include <QStringList>
27−#include <QDBusVirtualObject>
28−
29−class AccountsServiceDBusAdaptor;
30−
31−/**
32− * @brief An interface that provides all the data needed by the launcher.
33− */
34−
35−class LauncherBackendItem;
36−class LauncherBackendTest;
37−
38−class LauncherBackend : public QDBusVirtualObject
39−{
40− Q_OBJECT
41−
42− friend LauncherBackendTest;
43−
44−public:
45− LauncherBackend(QObject *parent = 0);
46− virtual ~LauncherBackend();
47−
48− /**
49− * @brief Returns a list of stored applications.
50− * @returns A list of application IDs.
51− */
52− QStringList storedApplications() const;
53−
54− /**
55− * @brief Set the list of stored applications.
56− *
57− * Any previously stored information for apps not contained
58− * in the list any more, e.g. the pinned state, will be
59− * discarded.
60− *
61− * @param appIds The new list of stored applications.
62− */
63− void setStoredApplications(const QStringList &appIds);
64−
65− /**
66− * @brief Get the full path to the .desktop file.
67− *
68− * The application does not need to be in the list of stored applications.
69− *
70− * @returns The full path to the .dekstop file.
71− */
72− QString desktopFile(const QString &appId) const;
73−
74− /**
75− * @brief Get the user friendly name of an application.
76− *
77− * The application does not need to be in the list of stored applications.
78− *
79− * @param appId The ID of the application.
80− * @returns The user friendly name of the application.
81− */
82− QString displayName(const QString &appId) const;
83−
84− /**
85− * @brief Get the icon of an application.
86− *
87− * The application does not need to be in the list of stored applications.
88− *
89− * @param appId The ID of the application.
90− * @returns The full path to the icon for the application.
91− */
92− QString icon(const QString &appId) const;
93−
94− /**
95− * @brief Get the QuickList for an application.
96− * @param appId The ID of the application.
97− * @returns A QuickListModelInterface containing the QuickList.
98− */
99− QList<QuickListEntry> quickList(const QString &appId) const;
100−
101− /**
102− * @brief Execute an action from the quickList
103− * @param appId The app ID for which the action was triggered
104− * @param the quicklist ID of the action that was triggered
105− */
106− void triggerQuickListAction(const QString &appId, const QString &entryId);
107−
108− /**
109− * @brief Get the progress for the progress overlay of an application.
110− * @param appId The ID of the application.
111− * @returns The percentage of the overlay progress bar. -1 if no progress bar available.
112− */
113− int progress(const QString &appId) const;
114−
115− /**
116− * @brief Get the count of the count overlay of an application.
117− * @param appId The ID of the application.
118− * @returns The number to be displayed in the overlay. -1 if no count overlay is available.
119− */
120− int count(const QString &appId) const;
121−
122− /**
123− * @brief Set the count on an item
124− * @param appId The ID of the application
125− * @param count Count to show on the application
126− */
127− void setCount(const QString &appId, int count) const;
128−
129− /**
130− * @brief Get whether the count should be visible
131− * @param appId The ID of the application.
132− * @returns Whether to show a count on the launcher
133− */
134− bool countVisible(const QString &appId) const;
135−
136− /**
137− * @brief Set the visibility of the count item
138− * @param appId The ID of the application
139− * @param visible Whether the count should be visible
140− */
141− void setCountVisible(const QString &appId, bool visible) const;
142−
143− /**
144− * @brief Sets the username for which to look up launcher items.
145− * @param username The username to use.
146− */
147− void setUser(const QString &username);
148−
149− /**
150− * @brief Handle a message to an application node
151− * @param message DBus message to handle
152− * @param connection DBus connection that we're using
153− * @returns whether the message was handled
154− */
155− virtual bool handleMessage(const QDBusMessage& message, const QDBusConnection& connection);
156−
157− /**
158− * @brief Get introspection information on the objects we're exporting
159− * @param path the dbus path containing the appid
160− * @returns Introspection information for that node in the tree
161− */
162− virtual QString introspect (const QString &path) const;
163−
164−Q_SIGNALS:
165− void quickListChanged(const QString &appId, const QList<QuickListEntry> &quickList) const;
166− void progressChanged(const QString &appId, int progress) const;
167− void countChanged(const QString &appId, int count) const;
168− void countVisibleChanged(const QString &appId, bool visible) const;
169−
170−private:
171− QString findDesktopFile(const QString &appId) const;
172− LauncherBackendItem* parseDesktopFile(const QString &desktopFile) const;
173−
174− QVariantMap itemToVariant(const QString &appId) const;
175− void loadFromVariant(const QVariantMap &details);
176−
177− bool isDefaultsItem(const QList<QVariantMap> &apps) const;
178− void syncFromAccounts();
179− void syncToAccounts();
180−
181− QList<QString> m_storedApps;
182− mutable QHash<QString, LauncherBackendItem*> m_itemCache;
183−
184− AccountsServiceDBusAdaptor *m_accounts;
185− QString m_user;
186−
187− void emitPropChangedDbus(const QString& appId, const QString& property, QVariant &value) const;
188−
189−protected: /* Protected to allow testing */
190− LauncherBackendItem* getItem(const QString& appId) const;
191−
192− static QString decodeAppId(const QString& path);
193− static QString encodeAppId(const QString& appId);
194−};
195−
196−#endif // LAUNCHERBACKEND_H
plugins/Unity/Launcher/dbusinterface.cppnew file+232
@@ -0,0 +1,232 @@
1+/*
2+ * Copyright 2014 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU Lesser General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ *
16+ * Authors:
17+ * Michael Zanetti <michael.zanetti@canonical.com>
18+ */
19+
20+#include "dbusinterface.h"
21+#include "launchermodel.h"
22+#include "launcheritem.h"
23+
24+#include <QDBusArgument>
25+#include <QDBusConnection>
26+#include <QDBusMessage>
27+#include <QDebug>
28+
29+DBusInterface::DBusInterface(LauncherModel *parent):
30+ QDBusVirtualObject(parent),
31+ m_launcherModel(parent)
32+{
33+ /* Set up ourselves on DBus */
34+ QDBusConnection con = QDBusConnection::sessionBus();
35+ if (!con.registerService("com.canonical.Unity.Launcher")) {
36+ qWarning() << "Unable to register launcher name";
37+ }
38+ if (!con.registerVirtualObject("/com/canonical/Unity/Launcher", this, QDBusConnection::VirtualObjectRegisterOption::SubPath)) {
39+ qWarning() << "Unable to register launcher object";
40+ }
41+}
42+
43+DBusInterface::~DBusInterface()
44+{
45+ /* Remove oursevles from DBus */
46+ QDBusConnection con = QDBusConnection::sessionBus();
47+ con.unregisterService("com.canonical.Unity.Launcher");
48+ con.unregisterObject("/com/canonical/Unity/Launcher");
49+}
50+
51+QString DBusInterface::introspect(const QString &path) const
52+{
53+ /* This case we should just list the nodes */
54+ if (path == "/com/canonical/Unity/Launcher/" || path == "/com/canonical/Unity/Launcher") {
55+ QString nodes;
56+
57+ // Add Refresh to introspect
58+ nodes = "<interface name=\"com.canonical.Unity.Launcher\">"
59+ "<method name=\"Refresh\"/>"
60+ "</interface>";
61+
62+ // Add dynamic properties for launcher emblems
63+ for (int i = 0; i < m_launcherModel->rowCount(); i++) {
64+ nodes.append("<node name=\"");
65+ nodes.append(encodeAppId(m_launcherModel->get(i)->appId()));
66+ nodes.append("\"/>\n");
67+ }
68+ return nodes;
69+ }
70+
71+ /* Should not happen, but let's handle it */
72+ if (!path.startsWith("/com/canonical/Unity/Launcher")) {
73+ return "";
74+ }
75+
76+ /* Now we should be looking at a node */
77+ QString nodeiface =
78+ "<interface name=\"com.canonical.Unity.Launcher.Item\">"
79+ "<property name=\"count\" type=\"i\" access=\"readwrite\" />"
80+ "<property name=\"countVisible\" type=\"b\" access=\"readwrite\" />"
81+ "</interface>";
82+ return nodeiface;
83+}
84+
85+
86+QString DBusInterface::decodeAppId(const QString& path)
87+{
88+ QByteArray bytes = path.toUtf8();
89+ QByteArray decoded;
90+
91+ for (int i = 0; i < bytes.size(); ++i) {
92+ char chr = bytes.at(i);
93+
94+ if (chr == '_') {
95+ QString number;
96+ number.append(bytes.at(i+1));
97+ number.append(bytes.at(i+2));
98+
99+ bool okay;
100+ char newchar = number.toUInt(&okay, 16);
101+ if (okay)
102+ decoded.append(newchar);
103+
104+ i += 2;
105+ } else {
106+ decoded.append(chr);
107+ }
108+ }
109+
110+ return QString::fromUtf8(decoded);
111+}
112+
113+QString DBusInterface::encodeAppId(const QString& appId)
114+{
115+ QByteArray bytes = appId.toUtf8();
116+ QString encoded;
117+
118+ for (int i = 0; i < bytes.size(); ++i) {
119+ uchar chr = bytes.at(i);
120+
121+ if ((chr >= 'a' && chr <= 'z') ||
122+ (chr >= 'A' && chr <= 'Z') ||
123+ (chr >= '0' && chr <= '9'&& i != 0)) {
124+ encoded.append(chr);
125+ } else {
126+ QString hexval = QString("_%1").arg(chr, 2, 16, QChar('0'));
127+ encoded.append(hexval.toUpper());
128+ }
129+ }
130+
131+ return encoded;
132+}
133+
134+bool DBusInterface::handleMessage(const QDBusMessage& message, const QDBusConnection& connection)
135+{
136+ /* Check to make sure we're getting properties on our interface */
137+ if (message.type() != QDBusMessage::MessageType::MethodCallMessage) {
138+ return false;
139+ }
140+
141+ // First handle methods of the Launcher interface
142+ if (message.interface() == "com.canonical.Unity.Launcher") {
143+ if (message.member() == "Refresh") {
144+ QDBusMessage reply = message.createReply();
145+ Q_EMIT refreshCalled();
146+ return connection.send(reply);
147+ }
148+ }
149+
150+ // Now handle dynamic properties (for launcher emblems)
151+ if (message.interface() != "org.freedesktop.DBus.Properties") {
152+ return false;
153+ }
154+
155+ if (message.member() != "GetAll" && message.arguments()[0].toString() != "com.canonical.Unity.Launcher.Item") {
156+ return false;
157+ }
158+
159+ /* Break down the path to just the app id */
160+ QString pathtemp = message.path();
161+ if (!pathtemp.startsWith("/com/canonical/Unity/Launcher/")) {
162+ return false;
163+ }
164+ pathtemp.remove("/com/canonical/Unity/Launcher/");
165+ if (pathtemp.indexOf('/') >= 0) {
166+ return false;
167+ }
168+
169+ /* Find ourselves an appid */
170+ QString appid = decodeAppId(pathtemp);
171+ int index = m_launcherModel->findApplication(appid);
172+ LauncherItem *item = static_cast<LauncherItem*>(m_launcherModel->get(index));
173+
174+ QVariantList retval;
175+ if (message.member() == "Get") {
176+ if (!item) {
177+ return false;
178+ }
179+ if (message.arguments()[1].toString() == "count") {
180+ retval.append(QVariant::fromValue(QDBusVariant(item->count())));
181+ } else if (message.arguments()[1].toString() == "countVisible") {
182+ retval.append(QVariant::fromValue(QDBusVariant(item->countVisible())));
183+ }
184+ } else if (message.member() == "Set") {
185+ if (message.arguments()[1].toString() == "count") {
186+ int newCount = message.arguments()[2].toInt();
187+ if (!item || newCount != item->count()) {
188+ Q_EMIT countChanged(appid, newCount);
189+ emitPropChangedDbus(appid, "count", QVariant(newCount));
190+ }
191+ } else if (message.arguments()[1].toString() == "countVisible") {
192+ bool newVisible = message.arguments()[2].toBool();
193+ if (!item || newVisible != item->countVisible()) {
194+ Q_EMIT countVisibleChanged(appid, newVisible);
195+ emitPropChangedDbus(appid, "countVisible", newVisible);
196+ }
197+ }
198+ } else if (message.member() == "GetAll") {
199+ if (item) {
200+ QVariantMap all;
201+ all.insert("count", item->count());
202+ all.insert("countVisible", item->countVisible());
203+ retval.append(all);
204+ }
205+ } else {
206+ return false;
207+ }
208+
209+ QDBusMessage reply = message.createReply(retval);
210+ return connection.send(reply);
211+}
212+
213+void DBusInterface::emitPropChangedDbus(const QString& appId, const QString& property, const QVariant &value)
214+{
215+ QString path("/com/canonical/Unity/Launcher/");
216+ path.append(encodeAppId(appId));
217+
218+ QDBusMessage message = QDBusMessage::createSignal(path, "org.freedesktop.DBus.Properties", "PropertiesChanged");
219+
220+ QList<QVariant> arguments;
221+ QVariantHash changedprops;
222+ changedprops[property] = QVariant::fromValue(QDBusVariant(value));
223+ QVariantList deletedprops;
224+
225+ arguments.append(changedprops);
226+ arguments.append(deletedprops);
227+
228+ message.setArguments(arguments);
229+
230+ QDBusConnection con = QDBusConnection::sessionBus();
231+ con.send(message);
232+}
plugins/Unity/Launcher/dbusinterface.hnew file+50
@@ -0,0 +1,50 @@
1+/*
2+ * Copyright 2014 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU Lesser General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ *
16+ * Authors:
17+ * Michael Zanetti <michael.zanetti@canonical.com>
18+ */
19+
20+#include "launcheritem.h"
21+
22+#include <QDBusVirtualObject>
23+
24+class LauncherModel;
25+
26+class DBusInterface: public QDBusVirtualObject
27+{
28+ Q_OBJECT
29+public:
30+ DBusInterface(LauncherModel *parent);
31+ ~DBusInterface();
32+
33+ // QDBusVirtualObject implementaition
34+ QString introspect (const QString &path) const override;
35+ bool handleMessage(const QDBusMessage& message, const QDBusConnection& connection) override;
36+
37+Q_SIGNALS:
38+ void countChanged(const QString &appId, int count);
39+ void countVisibleChanged(const QString &appId, bool countVisible);
40+ void refreshCalled();
41+
42+private:
43+ static QString decodeAppId(const QString& path);
44+ static QString encodeAppId(const QString& appId);
45+
46+ void emitPropChangedDbus(const QString& appId, const QString& property, const QVariant &value);
47+
48+ LauncherModel *m_launcherModel;
49+
50+};
plugins/Unity/Launcher/desktopfilehandler.cppnew file+151
@@ -0,0 +1,151 @@
1+/*
2+ * Copyright 2014 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU Lesser General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ *
16+ * Authors:
17+ * Michael Zanetti <michael.zanetti@canonical.com>
18+ */
19+
20+#include "desktopfilehandler.h"
21+
22+#include <QStringList>
23+#include <QStandardPaths>
24+#include <QDir>
25+#include <QSettings>
26+#include <QLocale>
27+
28+#include <libintl.h>
29+
30+DesktopFileHandler::DesktopFileHandler(const QString &appId, QObject *parent):
31+ QObject(parent),
32+ m_appId(appId)
33+{
34+ load();
35+}
36+
37+QString DesktopFileHandler::appId() const
38+{
39+ return m_appId;
40+}
41+
42+void DesktopFileHandler::setAppId(const QString &appId)
43+{
44+ if (m_appId != appId) {
45+ m_appId = appId;
46+ load();
47+ }
48+}
49+
50+QString DesktopFileHandler::filename() const
51+{
52+ return m_filename;
53+}
54+
55+bool DesktopFileHandler::isValid() const
56+{
57+ return !m_filename.isEmpty();
58+}
59+
60+void DesktopFileHandler::load()
61+{
62+ m_filename.clear();
63+
64+ if (m_appId.isEmpty()) {
65+ return;
66+ }
67+
68+ int dashPos = -1;
69+ QString helper = m_appId;
70+
71+ QStringList searchDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
72+#ifdef LAUNCHER_TESTING
73+ searchDirs << "";
74+#endif
75+
76+ QString path;
77+ do {
78+ if (dashPos != -1) {
79+ helper.replace(dashPos, 1, '/');
80+ }
81+
82+ if (helper.contains("/")) {
83+ path += helper.split('/').first() + '/';
84+ helper.remove(QRegExp("^" + path));
85+ }
86+
87+ Q_FOREACH(const QString &searchDirName, searchDirs) {
88+ QDir searchDir(searchDirName + "/" + path);
89+ Q_FOREACH(const QString &desktopFile, searchDir.entryList(QStringList() << "*.desktop")) {
90+ if (desktopFile.startsWith(helper)) {
91+ QFileInfo fileInfo(searchDir, desktopFile);
92+ m_filename = fileInfo.absoluteFilePath();
93+ return;
94+ }
95+ }
96+ }
97+
98+ dashPos = helper.indexOf("-");
99+ } while (dashPos != -1);
100+}
101+
102+QString DesktopFileHandler::displayName() const
103+{
104+ if (!isValid()) {
105+ return QString();
106+ }
107+
108+ QSettings settings(m_filename, QSettings::IniFormat);
109+ settings.beginGroup("Desktop Entry");
110+
111+ // First try to find Name[xx_YY] and Name[xx] in .desktop file
112+ QString locale = QLocale::system().name();
113+ QString shortLocale = locale.split('_').first();
114+
115+ if (locale != shortLocale && settings.contains(QString("Name[%1]").arg(locale))) {
116+ return settings.value(QString("Name[%1]").arg(locale)).toString();
117+ }
118+
119+ if (settings.contains(QString("Name[%1]").arg(shortLocale))) {
120+ return settings.value(QString("Name[%1]").arg(shortLocale)).toString();
121+ }
122+
123+ // No translation found in desktop file. Get the untranslated one and have a go with gettext.
124+ QString displayName = settings.value("Name").toString();
125+
126+ if (settings.contains("X-Ubuntu-Gettext-Domain")) {
127+ const QString domain = settings.value("X-Ubuntu-Gettext-Domain").toString();
128+ return dgettext(domain.toUtf8().constData(), displayName.toUtf8().constData());
129+ }
130+
131+ return displayName;
132+}
133+
134+QString DesktopFileHandler::icon() const
135+{
136+ if (!isValid()) {
137+ return QString();
138+ }
139+
140+ QSettings settings(m_filename, QSettings::IniFormat);
141+ settings.beginGroup("Desktop Entry");
142+ QString iconString = settings.value("Icon").toString();
143+ QString pathString = settings.value("Path").toString();
144+
145+ if (QFileInfo(iconString).exists()) {
146+ return QFileInfo(iconString).absoluteFilePath();
147+ } else if (QFileInfo(pathString + '/' + iconString).exists()) {
148+ return pathString + '/' + iconString;
149+ }
150+ return "image://theme/" + iconString;
151+}
plugins/Unity/Launcher/desktopfilehandler.hnew file+56
@@ -0,0 +1,56 @@
1+/*
2+ * Copyright 2014 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU Lesser General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ *
16+ * Authors:
17+ * Michael Zanetti <michael.zanetti@canonical.com>
18+ */
19+
20+#ifndef DESKTOPFILEHANDLER_H
21+#define DESKTOPFILEHANDLER_H
22+
23+#include <QObject>
24+
25+/**
26+ * When an object of this class is created or whenever setAppId(appId) is called,
27+ * this will search for a .desktop file matching the give appId. If a file is
28+ * found, isValid() will return true and the other methods return the contents
29+ * of the .desktop file.
30+ *
31+ * Note that this class will consider the user's locale and do a best effort
32+ * to return localized values.
33+ */
34+
35+class DesktopFileHandler: public QObject
36+{
37+ Q_OBJECT
38+public:
39+ DesktopFileHandler(const QString &appId = QString(), QObject *parent = nullptr);
40+
41+ QString appId() const;
42+ void setAppId(const QString &appId);
43+
44+ bool isValid() const;
45+ QString filename() const;
46+ QString displayName() const;
47+ QString icon() const;
48+
49+private:
50+ void load();
51+
52+ QString m_appId;
53+ QString m_filename;
54+};
55+
56+#endif
plugins/Unity/Launcher/gsettings.cppnew file+66
@@ -0,0 +1,66 @@
1+/*
2+ * Copyright 2014 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU Lesser General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ *
16+ * Authors:
17+ * Michael Zanetti <michael.zanetti@canonical.com>
18+ */
19+
20+#include "gsettings.h"
21+
22+#include <QGSettings>
23+#include <QVariant>
24+
25+GSettings::GSettings(QObject *parent):
26+ QObject(parent)
27+{
28+
29+}
30+
31+QStringList GSettings::storedApplications() const
32+{
33+ QStringList storedApps;
34+
35+ QGSettings gSettings("com.canonical.Unity.Launcher", "/com/canonical/unity/launcher/");
36+
37+ Q_FOREACH(const QString &entry, gSettings.get("items").toStringList()) {
38+ if (entry.startsWith("application:///")) {
39+ // convert legacy entries to new world appids
40+ QString appId = entry;
41+ // Transform "application://foobar.desktop" to "foobar"
42+ appId.remove(QRegExp("^application:///"));
43+ appId.remove(QRegExp(".desktop$"));
44+ storedApps << appId;
45+ } else if (entry.startsWith("appid://")) {
46+ QString appId = entry;
47+ appId.remove("appid://");
48+ if (appId.split('/').count() == 3) {
49+ // Strip current-user-version in case its there
50+ appId = appId.split('/').first() + "_" + appId.split('/').at(1);
51+ }
52+ storedApps << appId;
53+ }
54+ }
55+ return storedApps;
56+}
57+
58+void GSettings::setStoredApplications(const QStringList &storedApplications)
59+{
60+ QGSettings gSettings("com.canonical.Unity.Launcher", "/com/canonical/unity/launcher/");
61+ QStringList gSettingsList;
62+ Q_FOREACH(const QString &entry, storedApplications) {
63+ gSettingsList << QString("appid://%1").arg(entry);
64+ }
65+ gSettings.set("items", gSettingsList);
66+}
plugins/Unity/Launcher/gsettings.hnew file+37
@@ -0,0 +1,37 @@
1+/*
2+ * Copyright 2014 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU Lesser General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ *
16+ * Authors:
17+ * Michael Zanetti <michael.zanetti@canonical.com>
18+ */
19+
20+#ifndef GSETTINGS_H
21+#define GSETTINGS_H
22+
23+#include <QObject>
24+#include <QStringList>
25+
26+
27+class GSettings: public QObject
28+{
29+ Q_OBJECT
30+public:
31+ GSettings(QObject *parent = nullptr);
32+
33+ QStringList storedApplications() const;
34+ void setStoredApplications(const QStringList &storedApplications);
35+};
36+
37+#endif
plugins/Unity/Launcher/launcheritem.cpp+31
@@ -32,10 +32,12 @@ LauncherItem::LauncherItem(const QString &appId, const QString &name, const QStr
3232 m_recent(false),
3333 m_progress(-1),
3434 m_count(0),
35+ m_countVisible(false),
3536 m_focused(false),
3637 m_quickList(new QuickListModel(this))
3738{
3839 QuickListEntry nameAction;
40+ nameAction.setActionId("launch_item");
3941 nameAction.setText(m_name);
4042 m_quickList->appendAction(nameAction);
4143 QuickListEntry pinningAction;
@@ -54,11 +56,27 @@ QString LauncherItem::name() const
5456 return m_name;
5557}
5658
59+void LauncherItem::setName(const QString &name)
60+{
61+ if (m_name != name) {
62+ m_name = name;
63+ Q_EMIT nameChanged(name);
64+ }
65+}
66+
5767QString LauncherItem::icon() const
5868{
5969 return m_icon;
6070}
6171
72+void LauncherItem::setIcon(const QString &icon)
73+{
74+ if (m_icon != icon) {
75+ m_icon = icon;
76+ Q_EMIT iconChanged(icon);
77+ }
78+}
79+
6280bool LauncherItem::pinned() const
6381{
6482 return m_pinned;
@@ -128,6 +146,19 @@ void LauncherItem::setCount(int count)
128146 }
129147}
130148
149+bool LauncherItem::countVisible() const
150+{
151+ return m_countVisible;
152+}
153+
154+void LauncherItem::setCountVisible(bool countVisible)
155+{
156+ if (m_countVisible != countVisible) {
157+ m_countVisible = countVisible;
158+ Q_EMIT countVisibleChanged(countVisible);
159+ }
160+}
161+
131162bool LauncherItem::focused() const
132163{
133164 return m_focused;
plugins/Unity/Launcher/launcheritem.h+19−20
@@ -34,34 +34,30 @@ class LauncherItem: public LauncherItemInterface
3434public:
3535 LauncherItem(const QString &appId, const QString &name, const QString &icon, QObject *parent = 0);
3636
37− QString appId() const;
38− QString name() const;
39− QString icon() const;
37+ QString appId() const override;
38+ QString name() const override;
39+ QString icon() const override;
40+ bool pinned() const override;
41+ bool running() const override;
42+ bool recent() const override;
43+ int progress() const override;
44+ int count() const override;
45+ bool countVisible() const override;
46+ bool focused() const override;
47+
48+ unity::shell::launcher::QuickListModelInterface *quickList() const override;
4049
41− bool pinned() const;
50+private:
51+ void setName(const QString &name);
52+ void setIcon(const QString &icon);
4253 void setPinned(bool pinned);
43−
44− bool running() const;
4554 void setRunning(bool running);
46−
47− bool recent() const;
4855 void setRecent(bool recent);
49−
50− int progress() const;
5156 void setProgress(int progress);
52−
53− int count() const;
5457 void setCount(int count);
55−
56− bool focused() const;
58+ void setCountVisible(bool countVisible);
5759 void setFocused(bool focused);
5860
59− unity::shell::launcher::QuickListModelInterface *quickList() const;
60−
61−Q_SIGNALS:
62− void favoriteChanged(bool favorite);
63− void runningChanged(bool running);
64−
6561private:
6662 QString m_appId;
6763 QString m_name;
@@ -71,8 +67,11 @@ private:
7167 bool m_recent;
7268 int m_progress;
7369 int m_count;
70+ bool m_countVisible;
7471 bool m_focused;
7572 QuickListModel *m_quickList;
73+
74+ friend class LauncherModel;
7675};
7776
7877#endif // LAUNCHERITEM_H
plugins/Unity/Launcher/launchermodel.cpp+88−15
@@ -19,26 +19,37 @@
1919
2020#include "launchermodel.h"
2121#include "launcheritem.h"
22−#include "backend/launcherbackend.h"
22+#include "gsettings.h"
23+#include "desktopfilehandler.h"
24+#include "dbusinterface.h"
2325
2426#include <unity/shell/application/ApplicationInfoInterface.h>
2527
28+#include <QDesktopServices>
2629#include <QDebug>
2730
2831using namespace unity::shell::application;
2932
3033LauncherModel::LauncherModel(QObject *parent):
3134 LauncherModelInterface(parent),
32− m_backend(new LauncherBackend(this)),
35+ m_settings(new GSettings(this)),
36+ m_dbusIface(new DBusInterface(this)),
3337 m_appManager(0)
3438{
35− connect(m_backend, SIGNAL(countChanged(QString,int)), SLOT(countChanged(QString,int)));
36− connect(m_backend, SIGNAL(progressChanged(QString,int)), SLOT(progressChanged(QString,int)));
39+ connect(m_dbusIface, &DBusInterface::countChanged, this, &LauncherModel::countChanged);
40+ connect(m_dbusIface, &DBusInterface::countVisibleChanged, this, &LauncherModel::countVisibleChanged);
41+ connect(m_dbusIface, &DBusInterface::refreshCalled, this, &LauncherModel::refresh);
42+
43+ Q_FOREACH (const QString &entry, m_settings->storedApplications()) {
44+ DesktopFileHandler desktopFile(entry);
45+ if (!desktopFile.isValid()) {
46+ qWarning() << "Couldn't find a .desktop file for" << entry << ". Skipping...";
47+ continue;
48+ }
3749
38− Q_FOREACH (const QString &entry, m_backend->storedApplications()) {
3950 LauncherItem *item = new LauncherItem(entry,
40− m_backend->displayName(entry),
41− m_backend->icon(entry),
51+ desktopFile.displayName(),
52+ desktopFile.icon(),
4253 this);
4354 item->setPinned(true);
4455 m_list.append(item);
@@ -72,6 +83,8 @@ QVariant LauncherModel::data(const QModelIndex &index, int role) const
7283 return item->pinned();
7384 case RoleCount:
7485 return item->count();
86+ case RoleCountVisible:
87+ return item->countVisible();
7588 case RoleProgress:
7689 return item->progress();
7790 case RoleFocused:
@@ -138,10 +151,17 @@ void LauncherModel::pin(const QString &appId, int index)
138151 if (index == -1) {
139152 index = m_list.count();
140153 }
154+
155+ DesktopFileHandler desktopFile(appId);
156+ if (!desktopFile.isValid()) {
157+ qWarning() << "Can't pin this application, there is no .destkop file available.";
158+ return;
159+ }
160+
141161 beginInsertRows(QModelIndex(), index, index);
142162 LauncherItem *item = new LauncherItem(appId,
143− m_backend->displayName(appId),
144− m_backend->icon(appId),
163+ desktopFile.displayName(),
164+ desktopFile.icon(),
145165 this);
146166 item->setPinned(true);
147167 m_list.insert(index, item);
@@ -191,28 +211,32 @@ void LauncherModel::quickListActionInvoked(const QString &appId, int actionIndex
191211 } else {
192212 pin(appId);
193213 }
214+ } else if (actionId == "launch_item") {
215+ QDesktopServices::openUrl(getUrlForAppId(appId));
194216
195217 // Nope, we don't know this action, let the backend forward it to the application
196218 } else {
197− m_backend->triggerQuickListAction(appId, actionId);
219+ // TODO: forward quicklist action to app, possibly via m_dbusIface
198220 }
199221 }
200222}
201223
202224void LauncherModel::setUser(const QString &username)
203225{
204− m_backend->setUser(username);
226+ Q_UNUSED(username)
227+ qWarning() << "This backend doesn't support multiple users";
205228}
206229
207230QString LauncherModel::getUrlForAppId(const QString &appId) const
208231{
209232 // appId is either an appId or a legacy app name. Let's find out which
210− if (appId.isEmpty())
233+ if (appId.isEmpty()) {
211234 return QString();
235+ }
212236
213− QString df = m_backend->desktopFile(appId + ".desktop");
214− if (!df.isEmpty())
237+ if (!appId.contains("_")) {
215238 return "application:///" + appId + ".desktop";
239+ }
216240
217241 QStringList parts = appId.split('_');
218242 QString package = parts.value(0);
@@ -272,7 +296,7 @@ void LauncherModel::storeAppList()
272296 appIds << item->appId();
273297 }
274298 }
275− m_backend->setStoredApplications(appIds);
299+ m_settings->setStoredApplications(appIds);
276300}
277301
278302int LauncherModel::findApplication(const QString &appId)
@@ -307,6 +331,55 @@ void LauncherModel::countChanged(const QString &appId, int count)
307331 }
308332}
309333
334+void LauncherModel::countVisibleChanged(const QString &appId, int countVisible)
335+{
336+ int idx = findApplication(appId);
337+ if (idx >= 0) {
338+ LauncherItem *item = m_list.at(idx);
339+ item->setCountVisible(countVisible);
340+ Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleCountVisible);
341+
342+ // If countVisible goes to false, and the item is neither pinned nor recent we can drop it
343+ if (!countVisible && !item->pinned() && !item->recent()) {
344+ beginRemoveRows(QModelIndex(), idx, idx);
345+ m_list.takeAt(idx)->deleteLater();
346+ endRemoveRows();
347+ }
348+ } else {
349+ // Need to create a new LauncherItem and show the highlight
350+ DesktopFileHandler desktopFile(appId);
351+ if (countVisible && desktopFile.isValid()) {
352+ LauncherItem *item = new LauncherItem(appId,
353+ desktopFile.displayName(),
354+ desktopFile.icon());
355+ item->setCountVisible(true);
356+ beginInsertRows(QModelIndex(), m_list.count(), m_list.count());
357+ m_list.append(item);
358+ endInsertRows();
359+ }
360+ }
361+}
362+
363+void LauncherModel::refresh()
364+{
365+ QList<LauncherItem*> toBeRemoved;
366+ Q_FOREACH (LauncherItem* item, m_list) {
367+ DesktopFileHandler desktopFile(item->appId());
368+ if (!desktopFile.isValid()) {
369+ toBeRemoved << item;
370+ } else {
371+ int idx = m_list.indexOf(item);
372+ item->setName(desktopFile.displayName());
373+ item->setIcon(desktopFile.icon());
374+ Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleName << RoleIcon);
375+ }
376+ }
377+
378+ Q_FOREACH (LauncherItem* item, toBeRemoved) {
379+ requestRemove(item->appId());
380+ }
381+}
382+
310383void LauncherModel::applicationAdded(const QModelIndex &parent, int row)
311384{
312385 Q_UNUSED(parent);
plugins/Unity/Launcher/launchermodel.h+15−8
@@ -20,15 +20,14 @@
2020#ifndef LAUNCHERMODEL_H
2121#define LAUNCHERMODEL_H
2222
23−// unity-api
2423#include <unity/shell/launcher/LauncherModelInterface.h>
2524#include <unity/shell/application/ApplicationManagerInterface.h>
2625
27−// Qt
2826#include <QAbstractListModel>
2927
3028class LauncherItem;
31−class LauncherBackend;
29+class GSettings;
30+class DBusInterface;
3231
3332using namespace unity::shell::launcher;
3433using namespace unity::shell::application;
@@ -41,14 +40,13 @@ public:
4140 LauncherModel(QObject *parent = 0);
4241 ~LauncherModel();
4342
44− int rowCount(const QModelIndex &parent) const;
43+ int rowCount(const QModelIndex &parent = QModelIndex()) const;
4544
4645 QVariant data(const QModelIndex &index, int role) const;
4746
4847 Q_INVOKABLE unity::shell::launcher::LauncherItemInterface* get(int index) const;
4948 Q_INVOKABLE void move(int oldIndex, int newIndex);
5049 Q_INVOKABLE void pin(const QString &appId, int index = -1);
51− Q_INVOKABLE void requestRemove(const QString &appId);
5250 Q_INVOKABLE void quickListActionInvoked(const QString &appId, int actionIndex);
5351 Q_INVOKABLE void setUser(const QString &username);
5452 Q_INVOKABLE QString getUrlForAppId(const QString &appId) const;
@@ -56,13 +54,19 @@ public:
5654 unity::shell::application::ApplicationManagerInterface* applicationManager() const;
5755 void setApplicationManager(unity::shell::application::ApplicationManagerInterface *appManager);
5856
57+ int findApplication(const QString &appId);
58+
59+public Q_SLOTS:
60+ void requestRemove(const QString &appId);
61+
5962private:
6063 void storeAppList();
61− int findApplication(const QString &appId);
6264
6365private Q_SLOTS:
64− void progressChanged(const QString &appId, int progress);
6566 void countChanged(const QString &appId, int count);
67+ void countVisibleChanged(const QString &appId, int count);
68+ void progressChanged(const QString &appId, int progress);
69+ void refresh();
6670
6771 void applicationAdded(const QModelIndex &parent, int row);
6872 void applicationRemoved(const QModelIndex &parent, int row);
@@ -70,7 +74,10 @@ private Q_SLOTS:
7074
7175private:
7276 QList<LauncherItem*> m_list;
73− LauncherBackend *m_backend;
77+
78+ GSettings *m_settings;
79+ DBusInterface *m_dbusIface;
80+
7481 ApplicationManagerInterface *m_appManager;
7582};
7683
plugins/Unity/Launcher/common/quicklistentry.cpp → plugins/Unity/Launcher/quicklistentry.cpprenamed

The content is the same.

plugins/Unity/Launcher/common/quicklistentry.h → plugins/Unity/Launcher/quicklistentry.hrenamed

The content is the same.

plugins/Unity/Launcher/quicklistmodel.h+1−1
@@ -20,7 +20,7 @@
2020#ifndef QUICKLISTMODEL_H
2121#define QUICKLISTMODEL_H
2222
23−#include "common/quicklistentry.h"
23+#include "quicklistentry.h"
2424
2525#include <unity/shell/launcher/QuickListModelInterface.h>
2626
plugins/Unity/Session/CMakeLists.txt+7
@@ -1,10 +1,16 @@
1+include(FindPkgConfig)
2+
3+pkg_search_module(GIO REQUIRED gio-2.0)
4+
15include_directories(
26 ${CMAKE_CURRENT_SOURCE_DIR}
7+ ${GIO_INCLUDE_DIRS}
38)
49
510set(QMLSESSIONPLUGIN_SRC
611 plugin.cpp
712 dbusunitysessionservice.cpp
13+ orientationlock.cpp
814 )
915
1016add_library(UnitySession-qml MODULE
@@ -12,6 +18,7 @@ add_library(UnitySession-qml MODULE
1218 )
1319
1420qt5_use_modules(UnitySession-qml DBus Qml)
21+target_link_libraries(UnitySession-qml ${GIO_LDFLAGS})
1522
1623# export the qmldir and qmltypes files
1724add_unity8_plugin(Unity.Session 0.1 Unity/Session TARGETS UnitySession-qml)
plugins/Unity/Session/orientationlock.cppnew file+74
@@ -0,0 +1,74 @@
1+/*
2+ * Copyright (C) 2014 Canonical, Ltd.
3+ *
4+ * This program is free software: you can redistribute it and/or modify it under
5+ * the terms of the GNU Lesser General Public License version 3, as published by
6+ * the Free Software Foundation.
7+ *
8+ * This program is distributed in the hope that it will be useful, but WITHOUT
9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11+ * Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#include "orientationlock.h"
18+
19+#include <QDBusConnection>
20+#include <QDBusInterface>
21+
22+OrientationLock::OrientationLock(QObject *parent)
23+ : QObject(parent)
24+ , m_enabled(false)
25+ , m_savedOrientation(Qt::PortraitOrientation)
26+{
27+ m_systemSettings = g_settings_new("com.ubuntu.touch.system");
28+ g_signal_connect(m_systemSettings, "changed::rotation-lock",
29+ G_CALLBACK(OrientationLock::onEnabledChangedProxy), this);
30+ m_enabled = g_settings_get_boolean(m_systemSettings, "rotation-lock");
31+}
32+
33+OrientationLock::~OrientationLock()
34+{
35+ g_signal_handlers_disconnect_by_data(m_systemSettings, this);
36+ g_object_unref(m_systemSettings);
37+}
38+
39+bool OrientationLock::enabled() const
40+{
41+ return m_enabled;
42+}
43+
44+Qt::ScreenOrientation OrientationLock::savedOrientation() const
45+{
46+ return m_savedOrientation;
47+}
48+
49+void OrientationLock::onEnabledChangedProxy(GSettings */*settings*/, const gchar */*key*/, gpointer data)
50+{
51+ OrientationLock* _this = static_cast<OrientationLock*>(data);
52+ _this->onEnabledChanged();
53+}
54+
55+void OrientationLock::onEnabledChanged()
56+{
57+ const bool enabled = g_settings_get_boolean(m_systemSettings, "rotation-lock");
58+ if (m_enabled != enabled) {
59+ m_enabled = enabled;
60+ Q_EMIT enabledChanged();
61+ }
62+}
63+
64+void OrientationLock::setSavedOrientation(const Qt::ScreenOrientation orientation)
65+{
66+ if (orientation == m_savedOrientation) {
67+ return;
68+ }
69+
70+ m_savedOrientation = orientation;
71+
72+ //TODO - save value with dbus to persist over sessions
73+ Q_EMIT savedOrientationChanged();
74+}
plugins/Unity/Session/orientationlock.hnew file+60
@@ -0,0 +1,60 @@
1+/*
2+ * Copyright (C) 2014 Canonical, Ltd.
3+ *
4+ * This program is free software: you can redistribute it and/or modify it under
5+ * the terms of the GNU Lesser General Public License version 3, as published by
6+ * the Free Software Foundation.
7+ *
8+ * This program is distributed in the hope that it will be useful, but WITHOUT
9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11+ * Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+#ifndef ORIENTATIONLOCK_H
18+#define ORIENTATIONLOCK_H
19+
20+#include <gio/gio.h>
21+#include <QtCore/QObject>
22+
23+/**
24+ * @brief The OrientationLock class exports orientation lock related properties to QML
25+ * It has two properties:
26+ * - readonly boolean with the Orientation lock property state
27+ * - Qt::ScreenOrientation to save the locked orientation state across Sessions (only relevant if lock is true)
28+ */
29+class OrientationLock : public QObject
30+{
31+ Q_OBJECT
32+
33+ Q_PROPERTY(bool enabled READ enabled NOTIFY enabledChanged)
34+ Q_PROPERTY(Qt::ScreenOrientation savedOrientation READ savedOrientation WRITE setSavedOrientation
35+ NOTIFY savedOrientationChanged)
36+
37+public:
38+ explicit OrientationLock(QObject *parent = 0);
39+ ~OrientationLock();
40+
41+ bool enabled() const;
42+ Qt::ScreenOrientation savedOrientation() const;
43+ void setSavedOrientation(const Qt::ScreenOrientation orientation);
44+
45+Q_SIGNALS:
46+ void enabledChanged();
47+ void savedOrientationChanged();
48+
49+private Q_SLOTS:
50+ static void onEnabledChangedProxy(GSettings *settings, const gchar *key, gpointer data);
51+ void onEnabledChanged();
52+
53+private:
54+ GSettings *m_systemSettings;
55+
56+ bool m_enabled;
57+ Qt::ScreenOrientation m_savedOrientation;
58+};
59+
60+#endif // ORIENTATIONLOCK_H
plugins/Unity/Session/plugin.cpp+8−4
@@ -18,23 +18,27 @@
1818
1919#include "plugin.h"
2020#include "dbusunitysessionservice.h"
21+#include "orientationlock.h"
2122
2223#include <QAbstractItemModel>
2324#include <QDBusConnection>
2425#include <QtQml/qqml.h>
2526
26−static QObject *dbusunitysessionservice_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
27+static QObject *dbusunitysessionservice_provider(QQmlEngine */*engine*/, QJSEngine */*jsEngine*/)
2728{
28− Q_UNUSED(engine)
29− Q_UNUSED(scriptEngine)
30−
3129 return new DBusUnitySessionService();
3230}
3331
32+static QObject *orientationlock_provider(QQmlEngine */*engine*/, QJSEngine */*jsEngine*/)
33+{
34+ return new OrientationLock();
35+}
36+
3437void SessionPlugin::registerTypes(const char *uri)
3538{
3639 qmlRegisterType<QAbstractItemModel>();
3740
3841 Q_ASSERT(uri == QLatin1String("Unity.Session"));
3942 qmlRegisterSingletonType<DBusUnitySessionService>(uri, 0, 1, "DBusUnitySessionService", dbusunitysessionservice_provider);
43+ qmlRegisterSingletonType<OrientationLock>(uri, 0, 1, "OrientationLock", orientationlock_provider);
4044}
plugins/Utils/CMakeLists.txt+1
@@ -13,6 +13,7 @@ include_directories(
1313set(QMLPLUGIN_SRC
1414 qlimitproxymodelqml.cpp
1515 qsortfilterproxymodelqml.cpp
16+ relativetimeformatter.cpp
1617 timeformatter.cpp
1718 unitymenumodelpaths.cpp
1819 windowkeysfilter.cpp
plugins/Utils/plugin.cpp+2
@@ -28,6 +28,7 @@
2828// local
2929#include "qlimitproxymodelqml.h"
3030#include "qsortfilterproxymodelqml.h"
31+#include "relativetimeformatter.h"
3132#include "timeformatter.h"
3233#include "unitymenumodelpaths.h"
3334#include "windowkeysfilter.h"
@@ -44,6 +45,7 @@ void UtilsPlugin::registerTypes(const char *uri)
4445 qmlRegisterType<WindowKeysFilter>(uri, 0, 1, "WindowKeysFilter");
4546 qmlRegisterType<GDateTimeFormatter>(uri, 0, 1, "GDateTimeFormatter");
4647 qmlRegisterType<EasingCurve>(uri, 0, 1, "EasingCurve");
48+ qmlRegisterType<RelativeTimeFormatter>(uri, 0, 1, "RelativeTimeFormatter");
4749}
4850
4951void UtilsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
plugins/Utils/relativetimeformatter.cppnew file+268
@@ -0,0 +1,268 @@
1+/*
2+ * Copyright 2014 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ *
16+ */
17+
18+// Local
19+#include "relativetimeformatter.h"
20+
21+// Qt
22+#include <QDateTime>
23+
24+// Other
25+#include <glib.h>
26+#include <glib/gi18n.h>
27+#include <locale.h>
28+#include <langinfo.h>
29+#include <string.h>
30+
31+RelativeTimeFormatter::RelativeTimeFormatter(QObject *parent)
32+ : GDateTimeFormatter(parent)
33+{
34+}
35+
36+ /* Check the system locale setting to see if the format is 24-hour
37+ time or 12-hour time */
38+gboolean
39+is_locale_12h(void)
40+{
41+ int i;
42+ static const char *formats_24h[] = {"%H", "%R", "%T", "%OH", "%k", nullptr};
43+ const char* t_fmt = nl_langinfo(T_FMT);
44+
45+ for (i=0; formats_24h[i]!=nullptr; i++)
46+ if (strstr(t_fmt, formats_24h[i]) != nullptr)
47+ return FALSE;
48+
49+ return TRUE;
50+}
51+
52+typedef enum
53+{
54+ DATE_PROXIMITY_YESTERDAY,
55+ DATE_PROXIMITY_TODAY,
56+ DATE_PROXIMITY_TOMORROW,
57+ DATE_PROXIMITY_LAST_WEEK,
58+ DATE_PROXIMITY_NEXT_WEEK,
59+ DATE_PROXIMITY_FAR
60+} date_proximity_t;
61+
62+static date_proximity_t
63+getDateProximity(GDateTime* now, GDateTime* time)
64+{
65+ date_proximity_t prox = DATE_PROXIMITY_FAR;
66+ gint now_year, now_month, now_day;
67+ gint time_year, time_month, time_day;
68+
69+ // does it happen today?
70+ g_date_time_get_ymd(now, &now_year, &now_month, &now_day);
71+ g_date_time_get_ymd(time, &time_year, &time_month, &time_day);
72+ if ((now_year == time_year) && (now_month == time_month) && (now_day == time_day)) {
73+ return DATE_PROXIMITY_TODAY;
74+ }
75+
76+ // did it happen yesterday?
77+ GDateTime* tomorrow = g_date_time_add_days(now, -1);
78+ gint tom_year, tom_month, tom_day;
79+ g_date_time_get_ymd(tomorrow, &tom_year, &tom_month, &tom_day);
80+ g_date_time_unref(tomorrow);
81+ if ((tom_year == time_year) && (tom_month == time_month) && (tom_day == time_day)) {
82+ return DATE_PROXIMITY_YESTERDAY;
83+ }
84+
85+ // does it happen tomorrow?
86+ if (prox == DATE_PROXIMITY_FAR)
87+ {
88+ GDateTime* tomorrow = g_date_time_add_days(now, 1);
89+
90+ gint tom_year, tom_month, tom_day;
91+ g_date_time_get_ymd(tomorrow, &tom_year, &tom_month, &tom_day);
92+ g_date_time_unref(tomorrow);
93+ if ((tom_year == time_year) && (tom_month == time_month) && (tom_day == time_day)) {
94+ return DATE_PROXIMITY_TOMORROW;
95+ }
96+ }
97+
98+ // does it happen this week?
99+ if (prox == DATE_PROXIMITY_FAR) {
100+ if (g_date_time_compare(time, now) < 0) {
101+ GDateTime* last_week = g_date_time_add_days(now, -6);
102+ GDateTime* last_week_bound = g_date_time_new_local(g_date_time_get_year(last_week),
103+ g_date_time_get_month(last_week),
104+ g_date_time_get_day_of_month(last_week),
105+ 0, 0, 0);
106+ if (g_date_time_compare(time, last_week_bound) >= 0)
107+ prox = DATE_PROXIMITY_LAST_WEEK;
108+
109+ g_date_time_unref(last_week);
110+ g_date_time_unref(last_week_bound);
111+ } else {
112+ GDateTime* next_week = g_date_time_add_days(now, 6);
113+ GDateTime* next_week_bound = g_date_time_new_local(g_date_time_get_year(next_week),
114+ g_date_time_get_month(next_week),
115+ g_date_time_get_day_of_month(next_week),
116+ 23, 59, 59.9);
117+ if (g_date_time_compare(time, next_week_bound) <= 0)
118+ prox = DATE_PROXIMITY_NEXT_WEEK;
119+
120+ g_date_time_unref(next_week);
121+ g_date_time_unref(next_week_bound);
122+ }
123+
124+ }
125+
126+ return prox;
127+}
128+
129+const char*
130+dgettext_datetime(const char *text)
131+{
132+ return dgettext("indicator-datetime", text);
133+}
134+
135+/**
136+ * _ a time yesterday should be shown as (e.g. “Yesterday 3:55 PM”)
137+ * _ a time today should be shown as just the time (e.g. “3:55 PM”)
138+ * _ a time tomorrow should be shown as(e.g. “Tomorrow 3:55 PM”)
139+ * _ a time any other day this week should be shown as the short version of the
140+ * day and time (e.g. “Wed 3:55 PM”)
141+ * weekday (e.g. “Friday”)
142+ * _ a time after this week should be shown as the short version of the day,
143+ * date, and time (e.g. “Wed 21 Apr 3:55 PM”)
144+ * _ in addition, when presenting the times of upcoming events, the time should
145+ * be followed by the timezone if it is different from the one the computer
146+ * is currently set to. For example, “Wed 3:55 PM UTC−5”.
147+ *
148+ * TODO - keep inline with indicator-datetime
149+ */
150+char* generate_full_format_string_at_time (GDateTime* now,
151+ GDateTime* then)
152+{
153+ GString* ret = g_string_new (nullptr);
154+
155+ if (then != nullptr) {
156+ const date_proximity_t prox = getDateProximity(now, then);
157+
158+ if (is_locale_12h()) {
159+ switch (prox) {
160+ case DATE_PROXIMITY_YESTERDAY:
161+ /* Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
162+ This format string is used for showing, on a 12-hour clock, times that happen yesterday.
163+ (\u2003 is a unicode em space which is slightly wider than a normal space.)
164+ en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday 1:00 PM" */
165+ g_string_assign (ret, dgettext_datetime("Yesterday\u2003%l:%M %p"));
166+ break;
167+
168+ case DATE_PROXIMITY_TODAY:
169+ /* Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
170+ This format string is used for showing, on a 12-hour clock, times that happened today.
171+ en_US example: "%l:%M %p" --> "1:00 PM" */
172+ g_string_assign (ret, dgettext_datetime("%l:%M %p"));
173+ break;
174+
175+ case DATE_PROXIMITY_TOMORROW:
176+ /* Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
177+ This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
178+ (\u2003 is a unicode em space which is slightly wider than a normal space.)
179+ en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 1:00 PM" */
180+ g_string_assign (ret, dgettext_datetime("Tomorrow\u2003%l:%M %p"));
181+ break;
182+
183+ case DATE_PROXIMITY_LAST_WEEK:
184+ case DATE_PROXIMITY_NEXT_WEEK:
185+ /* Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
186+ This format string is used for showing, on a 12-hour clock, times that happened in the last week.
187+ (\u2003 is a unicode em space which is slightly wider than a normal space.)
188+ en_US example: "%a\u2003%l:%M %p" --> "Fri 1:00 PM" */
189+ g_string_assign (ret, dgettext_datetime("%a\u2003%l:%M %p"));
190+ break;
191+
192+ case DATE_PROXIMITY_FAR:
193+ /* Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
194+ This format string is used for showing, on a 12-hour clock, times that happened before a week from now.
195+ (\u2003 is a unicode em space which is slightly wider than a normal space.)
196+ en_US example: "%a %d %b\u2003%l:%M %p" --> "Fri Oct 31 1:00 PM"
197+ en_GB example: "%a %b %d\u2003%l:%M %p" --> "Fri 31 Oct 1:00 PM" */
198+ g_string_assign (ret, dgettext_datetime("%a %d %b\u2003%l:%M %p"));
199+ break;
200+ }
201+ } else {
202+ switch (prox) {
203+
204+ case DATE_PROXIMITY_YESTERDAY:
205+ /* Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
206+ This format string is used for showing, on a 24-hour clock, times that happen yesterday.
207+ (\u2003 is a unicode em space which is slightly wider than a normal space.)
208+ en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday 13:00" */
209+ g_string_assign (ret, dgettext_datetime("Yesterday\u2003%H:%M"));
210+ break;
211+
212+ case DATE_PROXIMITY_TODAY:
213+ /* Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
214+ This format string is used for showing, on a 24-hour clock, times that happened today.
215+ en_US example: "%H:%M" --> "13:00" */
216+ g_string_assign (ret, dgettext_datetime("%H:%M"));
217+ break;
218+
219+ case DATE_PROXIMITY_TOMORROW:
220+ /* Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
221+ This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
222+ (\u2003 is a unicode em space which is slightly wider than a normal space.)
223+ en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow 13:00" */
224+ g_string_assign (ret, dgettext_datetime("Tomorrow\u2003%H:%M"));
225+ break;
226+
227+ case DATE_PROXIMITY_LAST_WEEK:
228+ case DATE_PROXIMITY_NEXT_WEEK:
229+ /* Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
230+ This format string is used for showing, on a 24-hour clock, times that happened in the last week.
231+ (\u2003 is a unicode em space which is slightly wider than a normal space.)
232+ en_US example: "%a\u2003%H:%M" --> "Fri 13:00" */
233+ g_string_assign (ret, dgettext_datetime("%a\u2003%H:%M"));
234+ break;
235+
236+ case DATE_PROXIMITY_FAR:
237+ /* Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
238+ This format string is used for showing, on a 24-hour clock, times that happened before a week from now.
239+ (\u2003 is a unicode em space which is slightly wider than a normal space.)
240+ en_US example: "%a %d %b\u2003%H:%M" --> "Fri Oct 31 13:00"
241+ en_GB example: "%a %b %d\u2003%H:%M" --> "Fri 31 Oct 13:00" */
242+ g_string_assign (ret, dgettext_datetime("%a %d %b\u2003%H:%M"));
243+ break;
244+ }
245+ }
246+ }
247+
248+ return g_string_free (ret, FALSE);
249+}
250+
251+QString RelativeTimeFormatter::format() const
252+{
253+ GDateTime* now = g_date_time_new_from_unix_utc(QDateTime::currentMSecsSinceEpoch() / 1000);
254+ if (!now) { return QString(); }
255+
256+ GDateTime* then = g_date_time_new_from_unix_local(time());
257+ if (!then) { return QString(); }
258+
259+ char* time_format = generate_full_format_string_at_time(now, then);
260+
261+ QString str(QString::fromUtf8(time_format));
262+ g_free(time_format);
263+
264+ g_date_time_unref(now);
265+ g_date_time_unref(then);
266+
267+ return str;
268+}
plugins/Utils/relativetimeformatter.hnew file+34
@@ -0,0 +1,34 @@
1+/*
2+ * Copyright 2014 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ *
16+ */
17+
18+#ifndef RELATIVETIMEFORMATTER_H
19+#define RELATIVETIMEFORMATTER_H
20+
21+#include "timeformatter.h"
22+
23+// TODO - move this to the sdk
24+// https://blueprints.launchpad.net/ubuntu-ui-toolkit/+spec/time-formatter
25+class RelativeTimeFormatter : public GDateTimeFormatter
26+{
27+ Q_OBJECT
28+public:
29+ RelativeTimeFormatter(QObject *parent = 0);
30+
31+ QString format() const override;
32+};
33+
34+#endif // RELATIVETIMEFORMATTER_H
plugins/Utils/timeformatter.cpp+6−1
@@ -121,6 +121,11 @@ TimeFormatter::TimeFormatter(QObject *parent): QObject(parent)
121121 g_bus_get (G_BUS_TYPE_SYSTEM, priv->cancellable, got_bus, priv);
122122}
123123
124+TimeFormatter::TimeFormatter(const QString &initialFormat, QObject *parent): TimeFormatter(parent)
125+{
126+ priv->format = initialFormat;
127+}
128+
124129TimeFormatter::~TimeFormatter()
125130{
126131 if (priv->system_bus) {
@@ -177,7 +182,7 @@ QString TimeFormatter::formatTime() const
177182}
178183
179184GDateTimeFormatter::GDateTimeFormatter(QObject* parent)
180−: TimeFormatter(parent)
185+: TimeFormatter("%d-%m-%Y %I:%M%p", parent)
181186{
182187}
183188
plugins/Utils/timeformatter.h+3−1
@@ -33,7 +33,7 @@ public:
3333 TimeFormatter(QObject *parent = 0);
3434 virtual ~TimeFormatter();
3535
36− QString format() const;
36+ virtual QString format() const;
3737 QString timeString() const;
3838 qint64 time() const;
3939
@@ -48,6 +48,8 @@ Q_SIGNALS:
4848 void timeChanged(qint64 time);
4949
5050protected:
51+ TimeFormatter(const QString &initialFormat, QObject *parent = 0);
52+
5153 virtual QString formatTime() const;
5254
5355private:
plugins/Utils/windowkeysfilter.cpp+1
@@ -31,6 +31,7 @@ bool WindowKeysFilter::eventFilter(QObject *watched, QEvent *event)
3131{
3232 Q_ASSERT(!m_filteredWindow.isNull());
3333 Q_ASSERT(watched == static_cast<QObject*>(m_filteredWindow.data()));
34+ Q_UNUSED(watched);
3435
3536 if (event->type() == QEvent::KeyPress || event->type() == QEvent::KeyRelease) {
3637 // Let QML see this event and decide if it does not want it
po/am.po+145−94
@@ -7,78 +7,104 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-26 18:24+0200\n"
11−"PO-Revision-Date: 2014-08-23 17:14+0000\n"
10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
11+"PO-Revision-Date: 2014-10-04 15:36+0000\n"
1212"Last-Translator: samson <Unknown>\n"
1313"Language-Team: Amharic <am@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-28 06:29+0000\n"
18−"X-Generator: Launchpad (build 17174)\n"
17+"Plural-Forms: nplurals=2; plural=n > 1;\n"
18+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"
19+"X-Generator: Launchpad (build 17196)\n"
1920
20−#: plugins/LightDM/Greeter.cpp:129
21+#: plugins/LightDM/Greeter.cpp:130
2122msgid "Password: "
2223msgstr "የ መግቢያ ቃል: "
2324
24−#: plugins/Unity/Launcher/launcheritem.cpp:43
25−#: plugins/Unity/Launcher/launcheritem.cpp:73
25+#: plugins/Unity/Launcher/launcheritem.cpp:45
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
2627msgid "Pin shortcut"
2728msgstr "አቋራጭ ማጣበቂያ"
2829
29−#: plugins/Unity/Launcher/launcheritem.cpp:73
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
3031msgid "Unpin shortcut"
3132msgstr "አቋራጭ መለያያ"
3233
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr "አካሉ ተቆልፏል"
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr "ብዙ ጊዜ የተሳሳተ የ ማለፊያ ሀረግ ለማስገባት በ መሞከር ምክንያት ስልኩ ተቆልፏል"
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr "ብዙ ጊዜ የተሳሳተ የ ማለፊያ ኮድ ለማስገባት በ መሞከር ምክንያት ስልኩ ተቆልፏል"
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] "እባክዎን ይቆዩ %1 ደቂቃ እና ከዛ እንደ ገና ይምክሩ…"
51+msgstr[1] "እባክዎን ይቆዩ %1 ደቂቃዎች እና ከዛ እንደ ገና ይምክሩ…"
52+
3353#: qml/Components/Dialogs.qml:70
3454msgid "Log out"
35−msgstr ""
55+msgstr "መውጫ"
3656
3757#: qml/Components/Dialogs.qml:71
3858msgid "Are you sure you want to log out?"
39−msgstr ""
59+msgstr "በእርግጥ መውጣት ይፈልጋሉ?"
4060
4161#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97
4262#: qml/Components/Dialogs.qml:122
4363msgid "No"
44−msgstr ""
64+msgstr "አይ"
4565
4666#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104
4767#: qml/Components/Dialogs.qml:129
4868msgid "Yes"
49−msgstr ""
69+msgstr "አዎ"
5070
5171#: qml/Components/Dialogs.qml:94
5272msgid "Shut down"
53−msgstr ""
73+msgstr "ማጥፊያ"
5474
5575#: qml/Components/Dialogs.qml:95
5676msgid "Are you sure you want to shut down?"
57−msgstr ""
77+msgstr "በእርግጥ ማጥፋት ይፈልጋሉ?"
5878
5979#: qml/Components/Dialogs.qml:119
6080msgid "Reboot"
61−msgstr ""
81+msgstr "እንደገና ማስነሻ"
6282
6383#: qml/Components/Dialogs.qml:120
6484msgid "Are you sure you want to reboot?"
65−msgstr ""
85+msgstr "በእርግጥ እንደገና ማስነሳት ይፈልጋሉ?"
6686
6787#: qml/Components/Dialogs.qml:144
6888msgid "Power"
69−msgstr ""
89+msgstr "ሐይል"
7090
7191#: qml/Components/Dialogs.qml:145
7292msgid ""
7393"Are you sure you would like\n"
7494"to power off?"
7595msgstr ""
96+"በእርግጥ ሐይሉን ማጥፋት\n"
97+"ይፈልጋሉ?"
7698
77−#: qml/Components/Dialogs.qml:144
99+#: qml/Components/Dialogs.qml:147
78100msgid "Power off"
79101msgstr "ማጥፊያ"
80102
81−#: qml/Components/Dialogs.qml:162
103+#: qml/Components/Dialogs.qml:157
104+msgid "Restart"
105+msgstr "እንደገና ማስጀመሪያ"
106+
107+#: qml/Components/Dialogs.qml:167
82108msgid "Cancel"
83109msgstr "መሰረዣ"
84110
@@ -127,61 +153,46 @@ msgid ""
127153"You have now mastered the edge gestures and can start using the "
128154"phone<br><br>Tap on the screen to start"
129155msgstr ""
156+"አሁን የ ጠርዝ እንቅስቃሴን አውቀዋል እና መጀመር ይችላሉ ስልኩን መጠቀም <br><br>መመልከቻውን መታ ያድርጉ ለመጀመር"
130157
131−#: qml/Components/Lockscreen.qml:167
132−msgid "Please wait"
133−msgstr "እባክዎን ይቆዩ"
134−
135−#: qml/Components/Lockscreen.qml:172
136−msgid "Too many incorrect attempts"
137−msgstr "በርካታ የተሳሳቱ ሙከራዎች"
138−
139−#: qml/Components/Lockscreen.qml:206
158+#: qml/Components/Lockscreen.qml:218
140159msgid "Emergency Call"
141160msgstr "የ ድንገተኛ ጥሪ"
142161
143−#: qml/Components/Lockscreen.qml:226
162+#: qml/Components/Lockscreen.qml:250
144163msgid "OK"
145164msgstr "እሺ"
146165
147−#: qml/Components/PassphraseLockscreen.qml:61
148−#, qt-format
149−msgid "Hello %1"
150−msgstr "ሰላም %1"
151−
152−#: qml/Components/PassphraseLockscreen.qml:61
153−msgid "Hello"
154−msgstr "ሰላም"
155−
156−#: qml/Dash/GenericScopeView.qml:361
166+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
157167msgid "See less"
158168msgstr "አነስተኛ መመልከቻ"
159169
160−#: qml/Dash/GenericScopeView.qml:361
170+#: qml/Dash/GenericScopeView.qml:411
161171msgid "See all"
162172msgstr "ሁሉንም መመልከቻ"
163173
164−#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
174+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
175+#: qml/Panel/SearchIndicator.qml:27
165176msgid "Search"
166177msgstr "መፈለጊያ"
167178
168−#: qml/Dash/PageHeader.qml:270
179+#: qml/Dash/PageHeader.qml:268
169180msgid "Settings"
170−msgstr ""
181+msgstr "ማሰናጃ"
171182
172−#: qml/Dash/PageHeader.qml:279
183+#: qml/Dash/PageHeader.qml:275
173184msgid "Remove from Favorites"
174−msgstr ""
185+msgstr "ከምወዳቸው ማስወገጃ"
175186
176−#: qml/Dash/PageHeader.qml:279
187+#: qml/Dash/PageHeader.qml:275
177188msgid "Add to Favorites"
178−msgstr ""
189+msgstr "ወደምወዳቸው መጨመሪያ"
179190
180−#: qml/Dash/Previews/PreviewActionCombo.qml:34
191+#: qml/Dash/Previews/PreviewActionCombo.qml:35
181192msgid "More..."
182193msgstr "ተጨማሪ..."
183194
184−#: qml/Dash/Previews/PreviewActionCombo.qml:34
195+#: qml/Dash/Previews/PreviewActionCombo.qml:35
185196msgid "Less..."
186197msgstr "አነስተኛ..."
187198
@@ -197,15 +208,23 @@ msgstr "ግምገማ መጨመሪያ"
197208msgid "Send"
198209msgstr "መላኪያ"
199210
200−#: qml/Dash/ScopesOverview.qml:201
201−msgid "Manage Dash"
211+#: qml/Dash/PullToRefreshScopeStyle.qml:55
212+msgid "Pull to refresh…"
213+msgstr ""
214+
215+#: qml/Dash/PullToRefreshScopeStyle.qml:60
216+msgid "Release to refresh…"
202217msgstr ""
203218
204−#: qml/Dash/ScopesOverview.qml:408
219+#: qml/Dash/ScopesOverview.qml:206
220+msgid "Manage Scopes"
221+msgstr "የ ክልል አስተዳዳሪ"
222+
223+#: qml/Dash/ScopesOverview.qml:428
205224msgid "Done"
206225msgstr "ጨርሷል"
207226
208−#: qml/Dash/ScopesOverview.qml:434
227+#: qml/Dash/ScopesOverview.qml:454
209228msgid "Store"
210229msgstr "ማስቀመጫ"
211230
@@ -218,10 +237,10 @@ msgid "All"
218237msgstr "ሁሉንም"
219238
220239#: qml/Greeter/Greeter.qml:157
221−msgid "Swipe to unlock"
222−msgstr "ለመክፈት ይጥረጉ"
240+msgid "Unlock"
241+msgstr "መክፈቻ"
223242
224−#: qml/Hud/HudParametrizedActionsPage.qml:132
243+#: qml/Hud/HudParametrizedActionsPage.qml:139
225244msgid "Confirm"
226245msgstr "ማረጋገጫ"
227246
@@ -241,17 +260,17 @@ msgstr "አሁን ይናገሩ..."
241260msgid "Speaking..."
242261msgstr "በመናገር ላይ..."
243262
244−#: qml/Notifications/NotificationMenuItemFactory.qml:105
263+#: qml/Notifications/NotificationMenuItemFactory.qml:108
245264msgid "Show password"
246265msgstr "የመግቢያ ቃል ማሳያ"
247266
248−#: qml/Notifications/NotificationMenuItemFactory.qml:120
267+#: qml/Notifications/NotificationMenuItemFactory.qml:124
249268msgid "Enter SIM PIN"
250−msgstr ""
269+msgstr "ሲም ፒን ያስገቡ"
251270
252−#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
271+#: qml/Notifications/NotificationMenuItemFactory.qml:125
253272msgid "Sorry, incorrect PIN"
254−msgstr ""
273+msgstr "አዝናለሁ የተሳሳተ ፒን"
255274
256275#: qml/Panel/ActiveCallHint.qml:77
257276msgid "Tap to return to call..."
@@ -261,90 +280,122 @@ msgstr "ወደ ጥሪው ለመመለስ መታ ያድርጉ..."
261280msgid "Conference"
262281msgstr "ስብሰባ"
263282
264−#: qml/Panel/Indicators/MenuItemFactory.qml:651
283+#: qml/Panel/Indicators/MenuItemFactory.qml:600
284+msgid "Nothing is playing"
285+msgstr "ምንም አይጫወትም"
286+
287+#: qml/Panel/Indicators/MenuItemFactory.qml:748
265288msgid "In queue…"
266289msgstr "ወረፋ በመጠበቅ ላይ…"
267290
268−#: qml/Panel/Indicators/MenuItemFactory.qml:655
291+#: qml/Panel/Indicators/MenuItemFactory.qml:752
269292msgid "Downloading"
270293msgstr "በማውረድ ላይ"
271294
272−#: qml/Panel/Indicators/MenuItemFactory.qml:657
295+#: qml/Panel/Indicators/MenuItemFactory.qml:754
273296msgid "Paused, tap to resume"
274297msgstr "ማስቆሚያ: ለመቀጠል መታ ያድርጉ"
275298
276−#: qml/Panel/Indicators/MenuItemFactory.qml:659
299+#: qml/Panel/Indicators/MenuItemFactory.qml:756
277300msgid "Canceled"
278301msgstr "ተሰርዟል"
279302
280−#: qml/Panel/Indicators/MenuItemFactory.qml:661
303+#: qml/Panel/Indicators/MenuItemFactory.qml:758
281304msgid "Finished"
282305msgstr "ጨርሷል"
283306
284−#: qml/Panel/Indicators/MenuItemFactory.qml:663
307+#: qml/Panel/Indicators/MenuItemFactory.qml:760
285308msgid "Failed, tap to retry"
286309msgstr "አልተቻለም: እንደገና ለመሞከር መታ ያድርጉ"
287310
288311#: qml/Panel/Indicators/ModemInfoItem.qml:105
289312msgid "Unlock SIM"
290−msgstr ""
313+msgstr "ሲም መክፈቻ"
291314
292315#: qml/Panel/Indicators/RoamingIndication.qml:27
293316msgid "Roaming"
294−msgstr ""
317+msgstr "ማዘዋወሪያ"
295318
296−#: qml/Shell.qml:266
297−msgid "Enter your passphrase"
298−msgstr ""
319+#: qml/Shell.qml:340
320+msgid "Enter passphrase"
321+msgstr "የ ማለፊያ ሀረግ ያስገቡ"
299322
300−#: qml/Shell.qml:267
323+#: qml/Shell.qml:341
301324msgid "Sorry, incorrect passphrase"
302−msgstr ""
325+msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"
303326
304−#: qml/Shell.qml:282
305−msgid "Enter your passcode"
306−msgstr ""
327+#: qml/Shell.qml:342
328+msgid "Please re-enter"
329+msgstr "እባክዎን እንደገና-ያስገቡ"
307330
308−#: qml/Shell.qml:283
331+#: qml/Shell.qml:344
332+msgid "Enter passcode"
333+msgstr "የ ማለፊያ ኮድ ያስገቡ"
334+
335+#: qml/Shell.qml:345
309336msgid "Sorry, incorrect passcode"
310−msgstr ""
337+msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"
311338
312−#: qml/Shell.qml:273
339+#: qml/Shell.qml:348
313340#, qt-format
314−msgid "Enter your %1"
315−msgstr "ያስገቡ የ እርስዎን %1"
341+msgid "Enter %1"
342+msgstr "ማስገቢያ %1"
316343
317−#: qml/Shell.qml:274
344+#: qml/Shell.qml:349
318345#, qt-format
319346msgid "Sorry, incorrect %1"
320347msgstr "አዝናለሁ: የተሳሳተ%1"
321348
322−#: qml/Shell.qml:310
349+#: qml/Shell.qml:384
323350msgid "Sorry, incorrect passphrase."
324−msgstr ""
351+msgstr "አዝናለሁ የተሳሳተ የማለፊያ ሐረግ"
325352
326−#: qml/Shell.qml:311
353+#: qml/Shell.qml:385
327354msgid "Sorry, incorrect passcode."
328−msgstr ""
355+msgstr "አዝናለሁ የተሳሳተ የማለፊያ ኮድ"
329356
330−#: qml/Shell.qml:312
357+#: qml/Shell.qml:386
331358msgid "This will be your last attempt."
332359msgstr "ይህ የመጨረሻ ሙከራዎ ነው"
333360
334−#: qml/Shell.qml:314
361+#: qml/Shell.qml:388
335362msgid ""
336363"If passphrase is entered incorrectly, your phone will conduct a factory "
337364"reset and all personal data will be deleted."
338365msgstr ""
366+"የተሳሳተ የማለፊያ ሐረግ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "
367+"ይጠፋል"
339368
340−#: qml/Shell.qml:315
369+#: qml/Shell.qml:389
341370msgid ""
342371"If passcode is entered incorrectly, your phone will conduct a factory reset "
343372"and all personal data will be deleted."
344373msgstr ""
374+"የተሳሳተ የማለፊያ ኮድ ካስገቡ የ እርስዎ ስልክ ወደ ነበረበት ወደ ፋክቶሪው ዘዴ ይመለሳል: እና የ ግል ዳታ በሙሉ "
375+"ይጠፋል"
376+
377+#, qt-format
378+#~ msgid "Hello %1"
379+#~ msgstr "ሰላም %1"
380+
381+#~ msgid "Hello"
382+#~ msgstr "ሰላም"
383+
384+#~ msgid "Swipe to unlock"
385+#~ msgstr "ለመክፈት ይጥረጉ"
386+
387+#~ msgid "Please wait"
388+#~ msgstr "እባክዎን ይቆዩ"
389+
390+#~ msgid "Too many incorrect attempts"
391+#~ msgstr "በርካታ የተሳሳቱ ሙከራዎች"
392+
393+#, qt-format
394+#~ msgid "Enter your %1"
395+#~ msgstr "ያስገቡ የ እርስዎን %1"
345396
346−#~ msgid "Restart"
347−#~ msgstr "እንደገና ማስጀመሪያ"
397+#~ msgid "Enter your passphrase"
398+#~ msgstr "የማለፊያ ሐረግ ያስገቡ"
348399
349−#~ msgid "Are you sure you would like to turn power off?"
350−#~ msgstr "በእርግጥ ሐይሉን ማጥፋት ይፈልጋሉ"
400+#~ msgid "Enter your passcode"
401+#~ msgstr "የ እርስዎን የማለፊያ ኮድ ያስገቡ"
po/ar.po+101−66
@@ -7,29 +7,50 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-26 18:24+0200\n"
10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
1111"PO-Revision-Date: 2014-05-22 08:22+0000\n"
1212"Last-Translator: Ibrahim Saed <ibraheem5000@gmail.com>\n"
1313"Language-Team: Arabic <ar@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-28 06:29+0000\n"
18−"X-Generator: Launchpad (build 17174)\n"
17+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
18+"3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
19+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"
20+"X-Generator: Launchpad (build 17196)\n"
1921
20−#: plugins/LightDM/Greeter.cpp:129
22+#: plugins/LightDM/Greeter.cpp:130
2123msgid "Password: "
2224msgstr ""
2325
24−#: plugins/Unity/Launcher/launcheritem.cpp:43
25−#: plugins/Unity/Launcher/launcheritem.cpp:73
26+#: plugins/Unity/Launcher/launcheritem.cpp:45
27+#: plugins/Unity/Launcher/launcheritem.cpp:91
2628msgid "Pin shortcut"
2729msgstr ""
2830
29−#: plugins/Unity/Launcher/launcheritem.cpp:73
31+#: plugins/Unity/Launcher/launcheritem.cpp:91
3032msgid "Unpin shortcut"
3133msgstr ""
3234
35+#: qml/Components/DelayedLockscreen.qml:47
36+msgid "Device Locked"
37+msgstr ""
38+
39+#: qml/Components/DelayedLockscreen.qml:62
40+msgid "You have been locked out due to too many failed passphrase attempts."
41+msgstr ""
42+
43+#: qml/Components/DelayedLockscreen.qml:63
44+msgid "You have been locked out due to too many failed passcode attempts."
45+msgstr ""
46+
47+#: qml/Components/DelayedLockscreen.qml:72
48+#, qt-format
49+msgid "Please wait %1 minute and then try again…"
50+msgid_plural "Please wait %1 minutes and then try again…"
51+msgstr[0] ""
52+msgstr[1] ""
53+
3354#: qml/Components/Dialogs.qml:70
3455msgid "Log out"
3556msgstr ""
@@ -74,11 +95,15 @@ msgid ""
7495"to power off?"
7596msgstr ""
7697
77−#: qml/Components/Dialogs.qml:144
98+#: qml/Components/Dialogs.qml:147
7899msgid "Power off"
79100msgstr ""
80101
81−#: qml/Components/Dialogs.qml:162
102+#: qml/Components/Dialogs.qml:157
103+msgid "Restart"
104+msgstr ""
105+
106+#: qml/Components/Dialogs.qml:167
82107msgid "Cancel"
83108msgstr ""
84109
@@ -131,60 +156,44 @@ msgstr ""
131156"أنت الآن بارع في إيماءات الحواف ويمكنك البدء باستخدام هاتفك<br><br>انقر على "
132157"الشاشة للبدء"
133158
134−#: qml/Components/Lockscreen.qml:167
135−msgid "Please wait"
136−msgstr ""
137−
138−#: qml/Components/Lockscreen.qml:172
139−msgid "Too many incorrect attempts"
140−msgstr ""
141−
142−#: qml/Components/Lockscreen.qml:206
159+#: qml/Components/Lockscreen.qml:218
143160msgid "Emergency Call"
144161msgstr "مكالمة طوارئ"
145162
146−#: qml/Components/Lockscreen.qml:226
163+#: qml/Components/Lockscreen.qml:250
147164msgid "OK"
148165msgstr ""
149166
150−#: qml/Components/PassphraseLockscreen.qml:61
151−#, qt-format
152−msgid "Hello %1"
153−msgstr "مرحبا %1"
154−
155−#: qml/Components/PassphraseLockscreen.qml:61
156−msgid "Hello"
157−msgstr "مرحبًا"
158−
159−#: qml/Dash/GenericScopeView.qml:361
167+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
160168msgid "See less"
161169msgstr "شاهد أقل"
162170
163−#: qml/Dash/GenericScopeView.qml:361
171+#: qml/Dash/GenericScopeView.qml:411
164172msgid "See all"
165173msgstr ""
166174
167−#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
175+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
176+#: qml/Panel/SearchIndicator.qml:27
168177msgid "Search"
169178msgstr "ابحث"
170179
171−#: qml/Dash/PageHeader.qml:270
180+#: qml/Dash/PageHeader.qml:268
172181msgid "Settings"
173182msgstr ""
174183
175−#: qml/Dash/PageHeader.qml:279
184+#: qml/Dash/PageHeader.qml:275
176185msgid "Remove from Favorites"
177186msgstr ""
178187
179−#: qml/Dash/PageHeader.qml:279
188+#: qml/Dash/PageHeader.qml:275
180189msgid "Add to Favorites"
181190msgstr ""
182191
183−#: qml/Dash/Previews/PreviewActionCombo.qml:34
192+#: qml/Dash/Previews/PreviewActionCombo.qml:35
184193msgid "More..."
185194msgstr "المزيد..."
186195
187−#: qml/Dash/Previews/PreviewActionCombo.qml:34
196+#: qml/Dash/Previews/PreviewActionCombo.qml:35
188197msgid "Less..."
189198msgstr "أقل..."
190199
@@ -200,15 +209,23 @@ msgstr "أضف تعليق"
200209msgid "Send"
201210msgstr "أرسل"
202211
203−#: qml/Dash/ScopesOverview.qml:201
204−msgid "Manage Dash"
212+#: qml/Dash/PullToRefreshScopeStyle.qml:55
213+msgid "Pull to refresh…"
214+msgstr ""
215+
216+#: qml/Dash/PullToRefreshScopeStyle.qml:60
217+msgid "Release to refresh…"
205218msgstr ""
206219
207−#: qml/Dash/ScopesOverview.qml:408
220+#: qml/Dash/ScopesOverview.qml:206
221+msgid "Manage Scopes"
222+msgstr ""
223+
224+#: qml/Dash/ScopesOverview.qml:428
208225msgid "Done"
209226msgstr ""
210227
211−#: qml/Dash/ScopesOverview.qml:434
228+#: qml/Dash/ScopesOverview.qml:454
212229msgid "Store"
213230msgstr ""
214231
@@ -221,10 +238,10 @@ msgid "All"
221238msgstr ""
222239
223240#: qml/Greeter/Greeter.qml:157
224−msgid "Swipe to unlock"
225−msgstr "اسحب لفتح القفل"
241+msgid "Unlock"
242+msgstr ""
226243
227−#: qml/Hud/HudParametrizedActionsPage.qml:132
244+#: qml/Hud/HudParametrizedActionsPage.qml:139
228245msgid "Confirm"
229246msgstr "التأكيد"
230247
@@ -244,15 +261,15 @@ msgstr "تكلم الآن..."
244261msgid "Speaking..."
245262msgstr "تتكلم الآن..."
246263
247−#: qml/Notifications/NotificationMenuItemFactory.qml:105
264+#: qml/Notifications/NotificationMenuItemFactory.qml:108
248265msgid "Show password"
249266msgstr "عرض كلمة السر"
250267
251−#: qml/Notifications/NotificationMenuItemFactory.qml:120
268+#: qml/Notifications/NotificationMenuItemFactory.qml:124
252269msgid "Enter SIM PIN"
253270msgstr ""
254271
255−#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
272+#: qml/Notifications/NotificationMenuItemFactory.qml:125
256273msgid "Sorry, incorrect PIN"
257274msgstr ""
258275
@@ -264,27 +281,31 @@ msgstr ""
264281msgid "Conference"
265282msgstr ""
266283
267−#: qml/Panel/Indicators/MenuItemFactory.qml:651
284+#: qml/Panel/Indicators/MenuItemFactory.qml:600
285+msgid "Nothing is playing"
286+msgstr ""
287+
288+#: qml/Panel/Indicators/MenuItemFactory.qml:748
268289msgid "In queue…"
269290msgstr ""
270291
271−#: qml/Panel/Indicators/MenuItemFactory.qml:655
292+#: qml/Panel/Indicators/MenuItemFactory.qml:752
272293msgid "Downloading"
273294msgstr ""
274295
275−#: qml/Panel/Indicators/MenuItemFactory.qml:657
296+#: qml/Panel/Indicators/MenuItemFactory.qml:754
276297msgid "Paused, tap to resume"
277298msgstr ""
278299
279−#: qml/Panel/Indicators/MenuItemFactory.qml:659
300+#: qml/Panel/Indicators/MenuItemFactory.qml:756
280301msgid "Canceled"
281302msgstr ""
282303
283−#: qml/Panel/Indicators/MenuItemFactory.qml:661
304+#: qml/Panel/Indicators/MenuItemFactory.qml:758
284305msgid "Finished"
285306msgstr ""
286307
287−#: qml/Panel/Indicators/MenuItemFactory.qml:663
308+#: qml/Panel/Indicators/MenuItemFactory.qml:760
288309msgid "Failed, tap to retry"
289310msgstr ""
290311
@@ -296,52 +317,66 @@ msgstr ""
296317msgid "Roaming"
297318msgstr ""
298319
299−#: qml/Shell.qml:266
300−msgid "Enter your passphrase"
320+#: qml/Shell.qml:340
321+msgid "Enter passphrase"
301322msgstr ""
302323
303−#: qml/Shell.qml:267
324+#: qml/Shell.qml:341
304325msgid "Sorry, incorrect passphrase"
305326msgstr ""
306327
307−#: qml/Shell.qml:282
308−msgid "Enter your passcode"
328+#: qml/Shell.qml:342
329+msgid "Please re-enter"
330+msgstr ""
331+
332+#: qml/Shell.qml:344
333+msgid "Enter passcode"
309334msgstr ""
310335
311−#: qml/Shell.qml:283
336+#: qml/Shell.qml:345
312337msgid "Sorry, incorrect passcode"
313338msgstr ""
314339
315−#: qml/Shell.qml:273
340+#: qml/Shell.qml:348
316341#, qt-format
317−msgid "Enter your %1"
342+msgid "Enter %1"
318343msgstr ""
319344
320−#: qml/Shell.qml:274
345+#: qml/Shell.qml:349
321346#, qt-format
322347msgid "Sorry, incorrect %1"
323348msgstr ""
324349
325−#: qml/Shell.qml:310
350+#: qml/Shell.qml:384
326351msgid "Sorry, incorrect passphrase."
327352msgstr ""
328353
329−#: qml/Shell.qml:311
354+#: qml/Shell.qml:385
330355msgid "Sorry, incorrect passcode."
331356msgstr ""
332357
333−#: qml/Shell.qml:312
358+#: qml/Shell.qml:386
334359msgid "This will be your last attempt."
335360msgstr ""
336361
337−#: qml/Shell.qml:314
362+#: qml/Shell.qml:388
338363msgid ""
339364"If passphrase is entered incorrectly, your phone will conduct a factory "
340365"reset and all personal data will be deleted."
341366msgstr ""
342367
343−#: qml/Shell.qml:315
368+#: qml/Shell.qml:389
344369msgid ""
345370"If passcode is entered incorrectly, your phone will conduct a factory reset "
346371"and all personal data will be deleted."
347372msgstr ""
373+
374+#, qt-format
375+#~ msgid "Hello %1"
376+#~ msgstr "مرحبا %1"
377+
378+#~ msgid "Hello"
379+#~ msgstr "مرحبًا"
380+
381+#~ msgid "Swipe to unlock"
382+#~ msgstr "اسحب لفتح القفل"
po/ast.po+154−98
@@ -7,80 +7,106 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-26 18:24+0200\n"
11−"PO-Revision-Date: 2014-07-25 16:51+0000\n"
12−"Last-Translator: ivarela <ivarela@ubuntu.com>\n"
10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
11+"PO-Revision-Date: 2014-10-03 22:20+0000\n"
12+"Last-Translator: Xuacu Saturio <xuacusk8@gmail.com>\n"
1313"Language-Team: Asturian <ast@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-28 06:29+0000\n"
18−"X-Generator: Launchpad (build 17174)\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
18+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"
19+"X-Generator: Launchpad (build 17196)\n"
1920
20−#: plugins/LightDM/Greeter.cpp:129
21+#: plugins/LightDM/Greeter.cpp:130
2122msgid "Password: "
22−msgstr ""
23+msgstr "Contraseña: "
2324
24−#: plugins/Unity/Launcher/launcheritem.cpp:43
25−#: plugins/Unity/Launcher/launcheritem.cpp:73
25+#: plugins/Unity/Launcher/launcheritem.cpp:45
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
2627msgid "Pin shortcut"
2728msgstr "Anclar"
2829
29−#: plugins/Unity/Launcher/launcheritem.cpp:73
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
3031msgid "Unpin shortcut"
3132msgstr "Desanclar"
3233
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr "Preséu bloquiáu"
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] "Espera %1 minutu y vuelvi a intentalo…"
51+msgstr[1] "Espera %1 minutos y vuelvi a intentalo…"
52+
3353#: qml/Components/Dialogs.qml:70
3454msgid "Log out"
35−msgstr ""
55+msgstr "Zarrar sesión"
3656
3757#: qml/Components/Dialogs.qml:71
3858msgid "Are you sure you want to log out?"
39−msgstr ""
59+msgstr "De xuru que quies zarrar la sesión?"
4060
4161#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97
4262#: qml/Components/Dialogs.qml:122
4363msgid "No"
44−msgstr ""
64+msgstr "Non"
4565
4666#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104
4767#: qml/Components/Dialogs.qml:129
4868msgid "Yes"
49−msgstr ""
69+msgstr "Sí"
5070
5171#: qml/Components/Dialogs.qml:94
5272msgid "Shut down"
53−msgstr ""
73+msgstr "Apagar"
5474
5575#: qml/Components/Dialogs.qml:95
5676msgid "Are you sure you want to shut down?"
57−msgstr ""
77+msgstr "De xuru que quies apagar?"
5878
5979#: qml/Components/Dialogs.qml:119
6080msgid "Reboot"
61−msgstr ""
81+msgstr "Reaniciar"
6282
6383#: qml/Components/Dialogs.qml:120
6484msgid "Are you sure you want to reboot?"
65−msgstr ""
85+msgstr "De xuru que quies reaniciar?"
6686
6787#: qml/Components/Dialogs.qml:144
6888msgid "Power"
69−msgstr ""
89+msgstr "Enerxía"
7090
7191#: qml/Components/Dialogs.qml:145
7292msgid ""
7393"Are you sure you would like\n"
7494"to power off?"
7595msgstr ""
96+"De xuru que quies\n"
97+"apagar?"
7698
77−#: qml/Components/Dialogs.qml:144
99+#: qml/Components/Dialogs.qml:147
78100msgid "Power off"
79−msgstr ""
101+msgstr "Apagar"
102+
103+#: qml/Components/Dialogs.qml:157
104+msgid "Restart"
105+msgstr "Reaniciar"
80106
81−#: qml/Components/Dialogs.qml:162
107+#: qml/Components/Dialogs.qml:167
82108msgid "Cancel"
83−msgstr ""
109+msgstr "Encaboxar"
84110
85111#: qml/Components/EdgeDemoOverlay.qml:151
86112msgid "Skip intro"
@@ -132,60 +158,44 @@ msgstr ""
132158"Agora yá domines los xestos de los berbesos y pues entamar a usar el "
133159"teléfonu<br><br>Toca la pantalla pa comenzar"
134160
135−#: qml/Components/Lockscreen.qml:167
136−msgid "Please wait"
137−msgstr ""
138−
139−#: qml/Components/Lockscreen.qml:172
140−msgid "Too many incorrect attempts"
141−msgstr ""
142−
143−#: qml/Components/Lockscreen.qml:206
161+#: qml/Components/Lockscreen.qml:218
144162msgid "Emergency Call"
145163msgstr "Llamada d'emerxencia"
146164
147−#: qml/Components/Lockscreen.qml:226
165+#: qml/Components/Lockscreen.qml:250
148166msgid "OK"
149167msgstr "Aceutar"
150168
151−#: qml/Components/PassphraseLockscreen.qml:61
152−#, qt-format
153−msgid "Hello %1"
154−msgstr "Hola %1"
155−
156−#: qml/Components/PassphraseLockscreen.qml:61
157−msgid "Hello"
158−msgstr "Hola"
159−
160−#: qml/Dash/GenericScopeView.qml:361
169+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
161170msgid "See less"
162171msgstr "Ver menos"
163172
164−#: qml/Dash/GenericScopeView.qml:361
173+#: qml/Dash/GenericScopeView.qml:411
165174msgid "See all"
166175msgstr "Ver too"
167176
168−#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
177+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
178+#: qml/Panel/SearchIndicator.qml:27
169179msgid "Search"
170180msgstr "Guetar"
171181
172−#: qml/Dash/PageHeader.qml:270
182+#: qml/Dash/PageHeader.qml:268
173183msgid "Settings"
174−msgstr ""
184+msgstr "Axustes"
175185
176−#: qml/Dash/PageHeader.qml:279
186+#: qml/Dash/PageHeader.qml:275
177187msgid "Remove from Favorites"
178−msgstr ""
188+msgstr "Desaniciar de favoritos"
179189
180−#: qml/Dash/PageHeader.qml:279
190+#: qml/Dash/PageHeader.qml:275
181191msgid "Add to Favorites"
182−msgstr ""
192+msgstr "Amestar a favoritos"
183193
184−#: qml/Dash/Previews/PreviewActionCombo.qml:34
194+#: qml/Dash/Previews/PreviewActionCombo.qml:35
185195msgid "More..."
186196msgstr "Más…"
187197
188−#: qml/Dash/Previews/PreviewActionCombo.qml:34
198+#: qml/Dash/Previews/PreviewActionCombo.qml:35
189199msgid "Less..."
190200msgstr "Menos…"
191201
@@ -201,31 +211,39 @@ msgstr "Amestar una reseña"
201211msgid "Send"
202212msgstr "Unviar"
203213
204−#: qml/Dash/ScopesOverview.qml:201
205−msgid "Manage Dash"
214+#: qml/Dash/PullToRefreshScopeStyle.qml:55
215+msgid "Pull to refresh…"
206216msgstr ""
207217
208−#: qml/Dash/ScopesOverview.qml:408
209−msgid "Done"
218+#: qml/Dash/PullToRefreshScopeStyle.qml:60
219+msgid "Release to refresh…"
210220msgstr ""
211221
212−#: qml/Dash/ScopesOverview.qml:434
222+#: qml/Dash/ScopesOverview.qml:206
223+msgid "Manage Scopes"
224+msgstr "Xestionar ámbitos"
225+
226+#: qml/Dash/ScopesOverview.qml:428
227+msgid "Done"
228+msgstr "Fecho"
229+
230+#: qml/Dash/ScopesOverview.qml:454
213231msgid "Store"
214−msgstr ""
232+msgstr "Tienda"
215233
216234#: qml/Dash/ScopesOverviewTab.qml:36
217235msgid "Favorites"
218−msgstr ""
236+msgstr "Favoritos"
219237
220238#: qml/Dash/ScopesOverviewTab.qml:54
221239msgid "All"
222−msgstr ""
240+msgstr "Too"
223241
224242#: qml/Greeter/Greeter.qml:157
225−msgid "Swipe to unlock"
226−msgstr "Esliza pa desbloquiar"
243+msgid "Unlock"
244+msgstr "Desbloquiar"
227245
228−#: qml/Hud/HudParametrizedActionsPage.qml:132
246+#: qml/Hud/HudParametrizedActionsPage.qml:139
229247msgid "Confirm"
230248msgstr "Confirmar"
231249
@@ -245,17 +263,17 @@ msgstr "Fala agora…"
245263msgid "Speaking..."
246264msgstr "Falando…"
247265
248−#: qml/Notifications/NotificationMenuItemFactory.qml:105
266+#: qml/Notifications/NotificationMenuItemFactory.qml:108
249267msgid "Show password"
250268msgstr "Amosar contraseña"
251269
252−#: qml/Notifications/NotificationMenuItemFactory.qml:120
270+#: qml/Notifications/NotificationMenuItemFactory.qml:124
253271msgid "Enter SIM PIN"
254−msgstr ""
272+msgstr "Escribi'l PIN de la SIM"
255273
256−#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
274+#: qml/Notifications/NotificationMenuItemFactory.qml:125
257275msgid "Sorry, incorrect PIN"
258−msgstr ""
276+msgstr "PIN incorreutu"
259277
260278#: qml/Panel/ActiveCallHint.qml:77
261279msgid "Tap to return to call..."
@@ -265,84 +283,122 @@ msgstr "Tocar pa tornar a la llamada..."
265283msgid "Conference"
266284msgstr "Conferencia"
267285
268−#: qml/Panel/Indicators/MenuItemFactory.qml:651
286+#: qml/Panel/Indicators/MenuItemFactory.qml:600
287+msgid "Nothing is playing"
288+msgstr "Nun hai nada en reproducción"
289+
290+#: qml/Panel/Indicators/MenuItemFactory.qml:748
269291msgid "In queue…"
270292msgstr "N'espera…"
271293
272−#: qml/Panel/Indicators/MenuItemFactory.qml:655
294+#: qml/Panel/Indicators/MenuItemFactory.qml:752
273295msgid "Downloading"
274296msgstr "Baxando"
275297
276−#: qml/Panel/Indicators/MenuItemFactory.qml:657
298+#: qml/Panel/Indicators/MenuItemFactory.qml:754
277299msgid "Paused, tap to resume"
278300msgstr "Posáu, toca pa reanudar"
279301
280−#: qml/Panel/Indicators/MenuItemFactory.qml:659
302+#: qml/Panel/Indicators/MenuItemFactory.qml:756
281303msgid "Canceled"
282304msgstr "Encaboxáu"
283305
284−#: qml/Panel/Indicators/MenuItemFactory.qml:661
306+#: qml/Panel/Indicators/MenuItemFactory.qml:758
285307msgid "Finished"
286308msgstr "Finó"
287309
288−#: qml/Panel/Indicators/MenuItemFactory.qml:663
310+#: qml/Panel/Indicators/MenuItemFactory.qml:760
289311msgid "Failed, tap to retry"
290312msgstr "Falló, toca pa reintentar"
291313
292314#: qml/Panel/Indicators/ModemInfoItem.qml:105
293315msgid "Unlock SIM"
294−msgstr ""
316+msgstr "Desbloquiar SIM"
295317
296318#: qml/Panel/Indicators/RoamingIndication.qml:27
297319msgid "Roaming"
298−msgstr ""
320+msgstr "Roaming"
299321
300−#: qml/Shell.qml:266
301−msgid "Enter your passphrase"
322+#: qml/Shell.qml:340
323+msgid "Enter passphrase"
302324msgstr ""
303325
304−#: qml/Shell.qml:267
326+#: qml/Shell.qml:341
305327msgid "Sorry, incorrect passphrase"
306−msgstr ""
328+msgstr "Sentímoslo, contraseña incorreuta"
329+
330+#: qml/Shell.qml:342
331+msgid "Please re-enter"
332+msgstr "Vuelvi a escribila"
307333
308−#: qml/Shell.qml:282
309−msgid "Enter your passcode"
334+#: qml/Shell.qml:344
335+msgid "Enter passcode"
310336msgstr ""
311337
312−#: qml/Shell.qml:283
338+#: qml/Shell.qml:345
313339msgid "Sorry, incorrect passcode"
314−msgstr ""
340+msgstr "Sentímoslo, códigu de pasu incorreutu"
315341
316−#: qml/Shell.qml:273
342+#: qml/Shell.qml:348
317343#, qt-format
318−msgid "Enter your %1"
319−msgstr ""
344+msgid "Enter %1"
345+msgstr "Escribi %1"
320346
321−#: qml/Shell.qml:274
347+#: qml/Shell.qml:349
322348#, qt-format
323349msgid "Sorry, incorrect %1"
324−msgstr ""
350+msgstr "Sentímoslo, %1 incorreutu"
325351
326−#: qml/Shell.qml:310
352+#: qml/Shell.qml:384
327353msgid "Sorry, incorrect passphrase."
328−msgstr ""
354+msgstr "Fras de pasu incorreuta"
329355
330−#: qml/Shell.qml:311
356+#: qml/Shell.qml:385
331357msgid "Sorry, incorrect passcode."
332−msgstr ""
358+msgstr "Códigu de pasu incorreutu"
333359
334−#: qml/Shell.qml:312
360+#: qml/Shell.qml:386
335361msgid "This will be your last attempt."
336−msgstr ""
362+msgstr "Esti ye'l caberu intentu."
337363
338−#: qml/Shell.qml:314
364+#: qml/Shell.qml:388
339365msgid ""
340366"If passphrase is entered incorrectly, your phone will conduct a factory "
341367"reset and all personal data will be deleted."
342368msgstr ""
369+"Si s'inxerta la fras incorreutamente, el teléfonu va volver a la "
370+"configuración de fábrica y van perdese tolos datos personales."
343371
344−#: qml/Shell.qml:315
372+#: qml/Shell.qml:389
345373msgid ""
346374"If passcode is entered incorrectly, your phone will conduct a factory reset "
347375"and all personal data will be deleted."
348376msgstr ""
377+"Si s'inxerta'l códigu incorreutamente, el teléfonu va volver a la "
378+"configuración de fábrica y van perdese tolos datos personales."
379+
380+#~ msgid "Hello"
381+#~ msgstr "Hola"
382+
383+#, qt-format
384+#~ msgid "Hello %1"
385+#~ msgstr "Hola %1"
386+
387+#~ msgid "Swipe to unlock"
388+#~ msgstr "Esliza pa desbloquiar"
389+
390+#~ msgid "Please wait"
391+#~ msgstr "Espera un segundu"
392+
393+#, qt-format
394+#~ msgid "Enter your %1"
395+#~ msgstr "Introduz %1"
396+
397+#~ msgid "Enter your passphrase"
398+#~ msgstr "Introduz contraseña"
399+
400+#~ msgid "Enter your passcode"
401+#~ msgstr "Introduz códigu de pasu"
402+
403+#~ msgid "Too many incorrect attempts"
404+#~ msgstr "Munchos intentos incorreutos"
po/az.po+144−106
@@ -7,62 +7,82 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-26 18:24+0200\n"
11−"PO-Revision-Date: 2014-08-26 22:12+0000\n"
12−"Last-Translator: Turan Mahmudov <turan.mahmudov@gmail.com>\n"
10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
11+"PO-Revision-Date: 2014-09-03 16:39+0000\n"
12+"Last-Translator: Nicat Məmmədov <n1c4t97@gmail.com>\n"
1313"Language-Team: Azerbaijani <az@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-28 06:29+0000\n"
18−"X-Generator: Launchpad (build 17174)\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
18+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"
19+"X-Generator: Launchpad (build 17196)\n"
1920
20−#: plugins/LightDM/Greeter.cpp:129
21+#: plugins/LightDM/Greeter.cpp:130
2122msgid "Password: "
22−msgstr "Parol: "
23+msgstr "Şifrә: "
2324
24−#: plugins/Unity/Launcher/launcheritem.cpp:43
25−#: plugins/Unity/Launcher/launcheritem.cpp:73
25+#: plugins/Unity/Launcher/launcheritem.cpp:45
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
2627msgid "Pin shortcut"
2728msgstr "Pin qısayolu"
2829
29−#: plugins/Unity/Launcher/launcheritem.cpp:73
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
3031msgid "Unpin shortcut"
3132msgstr "Açma qısayolu"
3233
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
3353#: qml/Components/Dialogs.qml:70
3454msgid "Log out"
35−msgstr ""
55+msgstr "Çıxış"
3656
3757#: qml/Components/Dialogs.qml:71
3858msgid "Are you sure you want to log out?"
39−msgstr ""
59+msgstr "Çıxmaq istәdiyinizdәn әminsiniz?"
4060
4161#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97
4262#: qml/Components/Dialogs.qml:122
4363msgid "No"
44−msgstr ""
64+msgstr "Yox"
4565
4666#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104
4767#: qml/Components/Dialogs.qml:129
4868msgid "Yes"
49−msgstr ""
69+msgstr "Hə"
5070
5171#: qml/Components/Dialogs.qml:94
5272msgid "Shut down"
53−msgstr ""
73+msgstr "Sistemi Söndür"
5474
5575#: qml/Components/Dialogs.qml:95
5676msgid "Are you sure you want to shut down?"
57−msgstr ""
77+msgstr "Sistemi söndürmәk istәdiyinizә әminsiniz?"
5878
5979#: qml/Components/Dialogs.qml:119
6080msgid "Reboot"
61−msgstr ""
81+msgstr "Yenidən yüklə"
6282
6383#: qml/Components/Dialogs.qml:120
6484msgid "Are you sure you want to reboot?"
65−msgstr ""
85+msgstr "Yenidәn başlatmaq istәdiyinizә әminsiniz?"
6686
6787#: qml/Components/Dialogs.qml:144
6888msgid "Power"
@@ -74,17 +94,21 @@ msgid ""
7494"to power off?"
7595msgstr ""
7696
77−#: qml/Components/Dialogs.qml:144
97+#: qml/Components/Dialogs.qml:147
7898msgid "Power off"
7999msgstr "Söndür"
80100
81−#: qml/Components/Dialogs.qml:162
101+#: qml/Components/Dialogs.qml:157
102+msgid "Restart"
103+msgstr ""
104+
105+#: qml/Components/Dialogs.qml:167
82106msgid "Cancel"
83107msgstr "İmtina"
84108
85109#: qml/Components/EdgeDemoOverlay.qml:151
86110msgid "Skip intro"
87−msgstr "Intro -nu keç"
111+msgstr "Tәqdimatı keç"
88112
89113#: qml/Components/EdgeDemo.qml:112
90114msgid "Right edge"
@@ -92,7 +116,7 @@ msgstr "Sağ Künc"
92116
93117#: qml/Components/EdgeDemo.qml:113
94118msgid "Try swiping from the right edge to unlock the phone"
95−msgstr "Kilidi açmaq üçün sağ küncdən çəkin"
119+msgstr "Kilidi açmaq üçün sağ küncdən sürüşdürün"
96120
97121#: qml/Components/EdgeDemo.qml:144
98122msgid "Top edge"
@@ -100,7 +124,7 @@ msgstr "Yuxarı künc"
100124
101125#: qml/Components/EdgeDemo.qml:145
102126msgid "Try swiping from the top edge to access the indicators"
103−msgstr "Göstəricilərə keçid üçün yuxarı küncdən çəkin"
127+msgstr "Göstəriciləri görmәk üçün yuxarı küncdən sürüşdürün"
104128
105129#: qml/Components/EdgeDemo.qml:170
106130msgid "Close"
@@ -108,7 +132,7 @@ msgstr "Bağla"
108132
109133#: qml/Components/EdgeDemo.qml:171
110134msgid "Swipe up again to close the settings screen"
111−msgstr "Nizamlamalar ekranını bağlamaq üçün yenidən yuxarı çəkin"
135+msgstr "Nizamlamalar ekranını bağlamaq üçün yenidən yuxarı sürüşdürün"
112136
113137#: qml/Components/EdgeDemo.qml:198
114138msgid "Left edge"
@@ -128,69 +152,53 @@ msgid ""
128152"You have now mastered the edge gestures and can start using the "
129153"phone<br><br>Tap on the screen to start"
130154msgstr ""
131−"Siz künc jestlərini mənimsəmisiniz və telefonu istifadə etməyə başlaya "
155+"Siz künc hәrәkәtlәrini öyrәndiniz və telefonu istifadə etməyə başlaya "
132156"bilərsiniz.<br><br>Başlamaq üçün ekrana toxunun"
133157
134−#: qml/Components/Lockscreen.qml:167
135−msgid "Please wait"
136−msgstr "Lütfən gözləyin"
137−
138−#: qml/Components/Lockscreen.qml:172
139−msgid "Too many incorrect attempts"
140−msgstr "Çoxlu yanlış cəhd"
141−
142−#: qml/Components/Lockscreen.qml:206
158+#: qml/Components/Lockscreen.qml:218
143159msgid "Emergency Call"
144160msgstr "Zərurət zəngi"
145161
146−#: qml/Components/Lockscreen.qml:226
162+#: qml/Components/Lockscreen.qml:250
147163msgid "OK"
148−msgstr "ОК"
149−
150−#: qml/Components/PassphraseLockscreen.qml:61
151−#, qt-format
152−msgid "Hello %1"
153−msgstr "Xoş gördük %1"
164+msgstr "Oldu"
154165
155−#: qml/Components/PassphraseLockscreen.qml:61
156−msgid "Hello"
157−msgstr "Xoş gördük"
158−
159−#: qml/Dash/GenericScopeView.qml:361
166+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
160167msgid "See less"
161−msgstr "Daha az gör"
168+msgstr "Daha azını gör"
162169
163−#: qml/Dash/GenericScopeView.qml:361
170+#: qml/Dash/GenericScopeView.qml:411
164171msgid "See all"
165172msgstr "Hamısını gör"
166173
167−#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
174+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
175+#: qml/Panel/SearchIndicator.qml:27
168176msgid "Search"
169177msgstr "Axtar"
170178
171−#: qml/Dash/PageHeader.qml:270
179+#: qml/Dash/PageHeader.qml:268
172180msgid "Settings"
173−msgstr ""
181+msgstr "Tənzimləmələr"
174182
175−#: qml/Dash/PageHeader.qml:279
183+#: qml/Dash/PageHeader.qml:275
176184msgid "Remove from Favorites"
177−msgstr ""
185+msgstr "Seçilmişlәrdәn çıxart"
178186
179−#: qml/Dash/PageHeader.qml:279
187+#: qml/Dash/PageHeader.qml:275
180188msgid "Add to Favorites"
181−msgstr ""
189+msgstr "Seçilmişlәrә әlavә et"
182190
183−#: qml/Dash/Previews/PreviewActionCombo.qml:34
191+#: qml/Dash/Previews/PreviewActionCombo.qml:35
184192msgid "More..."
185−msgstr "Ətraflı..."
193+msgstr "Daha çox..."
186194
187−#: qml/Dash/Previews/PreviewActionCombo.qml:34
195+#: qml/Dash/Previews/PreviewActionCombo.qml:35
188196msgid "Less..."
189197msgstr "Az..."
190198
191199#: qml/Dash/Previews/PreviewRatingInput.qml:81
192200msgid "Rate this"
193−msgstr "Qiymət ver"
201+msgstr "Qiymәtlәndir"
194202
195203#: qml/Dash/Previews/PreviewRatingInput.qml:126
196204msgid "Add a review"
@@ -200,17 +208,25 @@ msgstr "Rəy yaz"
200208msgid "Send"
201209msgstr "Göndər"
202210
203−#: qml/Dash/ScopesOverview.qml:201
204−msgid "Manage Dash"
211+#: qml/Dash/PullToRefreshScopeStyle.qml:55
212+msgid "Pull to refresh…"
213+msgstr ""
214+
215+#: qml/Dash/PullToRefreshScopeStyle.qml:60
216+msgid "Release to refresh…"
205217msgstr ""
206218
207−#: qml/Dash/ScopesOverview.qml:408
219+#: qml/Dash/ScopesOverview.qml:206
220+msgid "Manage Scopes"
221+msgstr ""
222+
223+#: qml/Dash/ScopesOverview.qml:428
208224msgid "Done"
209225msgstr "Başa çatdı"
210226
211−#: qml/Dash/ScopesOverview.qml:434
227+#: qml/Dash/ScopesOverview.qml:454
212228msgid "Store"
213−msgstr "Saxla"
229+msgstr ""
214230
215231#: qml/Dash/ScopesOverviewTab.qml:36
216232msgid "Favorites"
@@ -221,16 +237,16 @@ msgid "All"
221237msgstr "Hamısı"
222238
223239#: qml/Greeter/Greeter.qml:157
224−msgid "Swipe to unlock"
225−msgstr "Kilidi açmaq üçün sürüşdürün"
240+msgid "Unlock"
241+msgstr ""
226242
227−#: qml/Hud/HudParametrizedActionsPage.qml:132
243+#: qml/Hud/HudParametrizedActionsPage.qml:139
228244msgid "Confirm"
229245msgstr "Təsdiqlə"
230246
231247#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
232248msgid "Type or say a command"
233−msgstr "Əmri söyləyin və ya yazın"
249+msgstr "Bir әmr söyləyin və ya yazın"
234250
235251#: qml/Hud/Hud.qml:84
236252msgid "Loading. Please Wait..."
@@ -244,17 +260,17 @@ msgstr "Danışın..."
244260msgid "Speaking..."
245261msgstr "Danışır..."
246262
247−#: qml/Notifications/NotificationMenuItemFactory.qml:105
263+#: qml/Notifications/NotificationMenuItemFactory.qml:108
248264msgid "Show password"
249−msgstr "Parolu göstər"
265+msgstr "Şifrәni göstәr"
250266
251−#: qml/Notifications/NotificationMenuItemFactory.qml:120
267+#: qml/Notifications/NotificationMenuItemFactory.qml:124
252268msgid "Enter SIM PIN"
253269msgstr "SIM PIN kodunuzu daxil edin"
254270
255−#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
271+#: qml/Notifications/NotificationMenuItemFactory.qml:125
256272msgid "Sorry, incorrect PIN"
257−msgstr "Təəssüf ki, PIN yanlışdır"
273+msgstr "Bağışlayın, PIN yanlışdır"
258274
259275#: qml/Panel/ActiveCallHint.qml:77
260276msgid "Tap to return to call..."
@@ -264,29 +280,33 @@ msgstr "Zəngə qayıtmaq üçün toxunun..."
264280msgid "Conference"
265281msgstr "Konfrans"
266282
267−#: qml/Panel/Indicators/MenuItemFactory.qml:651
283+#: qml/Panel/Indicators/MenuItemFactory.qml:600
284+msgid "Nothing is playing"
285+msgstr ""
286+
287+#: qml/Panel/Indicators/MenuItemFactory.qml:748
268288msgid "In queue…"
269289msgstr "Növbədədir..."
270290
271−#: qml/Panel/Indicators/MenuItemFactory.qml:655
291+#: qml/Panel/Indicators/MenuItemFactory.qml:752
272292msgid "Downloading"
273293msgstr "Endirilir"
274294
275−#: qml/Panel/Indicators/MenuItemFactory.qml:657
295+#: qml/Panel/Indicators/MenuItemFactory.qml:754
276296msgid "Paused, tap to resume"
277−msgstr "Saxlanıldı, davam etmək üçün toxunun"
297+msgstr "Dayandırıldı. Davam etmək üçün toxunun"
278298
279−#: qml/Panel/Indicators/MenuItemFactory.qml:659
299+#: qml/Panel/Indicators/MenuItemFactory.qml:756
280300msgid "Canceled"
281301msgstr "İmtina edildi"
282302
283−#: qml/Panel/Indicators/MenuItemFactory.qml:661
303+#: qml/Panel/Indicators/MenuItemFactory.qml:758
284304msgid "Finished"
285305msgstr "Bitdi"
286306
287−#: qml/Panel/Indicators/MenuItemFactory.qml:663
307+#: qml/Panel/Indicators/MenuItemFactory.qml:760
288308msgid "Failed, tap to retry"
289−msgstr "Alınmadı, davam etmək üçün toxunun"
309+msgstr "Alınmadı. Yenidәn cәhd etmək üçün toxunun"
290310
291311#: qml/Panel/Indicators/ModemInfoItem.qml:105
292312msgid "Unlock SIM"
@@ -296,45 +316,49 @@ msgstr "SIM kilidini aç"
296316msgid "Roaming"
297317msgstr "Rominq"
298318
299−#: qml/Shell.qml:266
300−msgid "Enter your passphrase"
301−msgstr "Açar sözünüzü daxil edin"
319+#: qml/Shell.qml:340
320+msgid "Enter passphrase"
321+msgstr ""
302322
303−#: qml/Shell.qml:267
323+#: qml/Shell.qml:341
304324msgid "Sorry, incorrect passphrase"
305−msgstr "Təəssüf ki, açar söz yanlışdır"
325+msgstr "Bağışlayın, açar söz yanlışdır"
326+
327+#: qml/Shell.qml:342
328+msgid "Please re-enter"
329+msgstr ""
306330
307−#: qml/Shell.qml:282
308−msgid "Enter your passcode"
331+#: qml/Shell.qml:344
332+msgid "Enter passcode"
309333msgstr ""
310334
311−#: qml/Shell.qml:283
335+#: qml/Shell.qml:345
312336msgid "Sorry, incorrect passcode"
313337msgstr ""
314338
315−#: qml/Shell.qml:273
339+#: qml/Shell.qml:348
316340#, qt-format
317−msgid "Enter your %1"
318−msgstr "%1 daxil edin"
341+msgid "Enter %1"
342+msgstr ""
319343
320−#: qml/Shell.qml:274
344+#: qml/Shell.qml:349
321345#, qt-format
322346msgid "Sorry, incorrect %1"
323−msgstr "Təəssüf ki, %1 yanlışdır"
347+msgstr "Bağışlayın, %1 yanlışdır"
324348
325−#: qml/Shell.qml:310
349+#: qml/Shell.qml:384
326350msgid "Sorry, incorrect passphrase."
327−msgstr "Təəssüf ki, açar söz yanlışdır."
351+msgstr "Bağışlayın, açar söz yanlışdır."
328352
329−#: qml/Shell.qml:311
353+#: qml/Shell.qml:385
330354msgid "Sorry, incorrect passcode."
331355msgstr "Təəssüf ki, açar kod yanlışdır."
332356
333−#: qml/Shell.qml:312
357+#: qml/Shell.qml:386
334358msgid "This will be your last attempt."
335359msgstr "Bu sizin son cəhdiniz olacaq."
336360
337−#: qml/Shell.qml:314
361+#: qml/Shell.qml:388
338362msgid ""
339363"If passphrase is entered incorrectly, your phone will conduct a factory "
340364"reset and all personal data will be deleted."
@@ -342,7 +366,7 @@ msgstr ""
342366"Əgər açar söz yanlış daxil edilibsə, onda telefonunuz fabrika parametrlərinə "
343367"geri qayıdacaq və bütün şəxsi məlumatlarınız silinəcək."
344368
345−#: qml/Shell.qml:315
369+#: qml/Shell.qml:389
346370msgid ""
347371"If passcode is entered incorrectly, your phone will conduct a factory reset "
348372"and all personal data will be deleted."
@@ -350,11 +374,25 @@ msgstr ""
350374"Əgər açar kod yanlış daxil edilibsə, onda telefonunuz fabrika parametrlərinə "
351375"geri qayıdacaq və bütün şəxsi məlumatlarınız silinəcək."
352376
353−#~ msgid "Are you sure you would like to turn power off?"
354−#~ msgstr "Söndürmək istədiyinizə əminsiniz?"
377+#~ msgid "Swipe to unlock"
378+#~ msgstr "Kilidi açmaq üçün sürüşdürün"
355379
356−#~ msgid "Restart"
357−#~ msgstr "Yenidən Başlat"
380+#, qt-format
381+#~ msgid "Enter your %1"
382+#~ msgstr "%1 daxil edin"
383+
384+#~ msgid "Enter your passphrase"
385+#~ msgstr "Açar sözünüzü daxil edin"
386+
387+#~ msgid "Please wait"
388+#~ msgstr "Xahiş edirik gözləyin"
389+
390+#~ msgid "Too many incorrect attempts"
391+#~ msgstr "Çoxlu yanlış cəhdlәr"
392+
393+#, qt-format
394+#~ msgid "Hello %1"
395+#~ msgstr "Salam %1"
358396
359−#~ msgid "Enter your PIN"
360−#~ msgstr "PIN kodunuzu daxil edin"
397+#~ msgid "Hello"
398+#~ msgstr "Salam"
po/be.ponew file+369
@@ -0,0 +1,369 @@
1+# Belarusian translation for unity8
2+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
3+# This file is distributed under the same license as the unity8 package.
4+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
5+#
6+msgid ""
7+msgstr ""
8+"Project-Id-Version: unity8\n"
9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
11+"PO-Revision-Date: 2014-09-24 17:12+0000\n"
12+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13+"Language-Team: Belarusian <be@li.org>\n"
14+"MIME-Version: 1.0\n"
15+"Content-Type: text/plain; charset=UTF-8\n"
16+"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
18+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
19+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"
20+"X-Generator: Launchpad (build 17196)\n"
21+
22+#: plugins/LightDM/Greeter.cpp:130
23+msgid "Password: "
24+msgstr ""
25+
26+#: plugins/Unity/Launcher/launcheritem.cpp:45
27+#: plugins/Unity/Launcher/launcheritem.cpp:91
28+msgid "Pin shortcut"
29+msgstr ""
30+
31+#: plugins/Unity/Launcher/launcheritem.cpp:91
32+msgid "Unpin shortcut"
33+msgstr ""
34+
35+#: qml/Components/DelayedLockscreen.qml:47
36+msgid "Device Locked"
37+msgstr ""
38+
39+#: qml/Components/DelayedLockscreen.qml:62
40+msgid "You have been locked out due to too many failed passphrase attempts."
41+msgstr ""
42+
43+#: qml/Components/DelayedLockscreen.qml:63
44+msgid "You have been locked out due to too many failed passcode attempts."
45+msgstr ""
46+
47+#: qml/Components/DelayedLockscreen.qml:72
48+#, qt-format
49+msgid "Please wait %1 minute and then try again…"
50+msgid_plural "Please wait %1 minutes and then try again…"
51+msgstr[0] ""
52+msgstr[1] ""
53+
54+#: qml/Components/Dialogs.qml:70
55+msgid "Log out"
56+msgstr ""
57+
58+#: qml/Components/Dialogs.qml:71
59+msgid "Are you sure you want to log out?"
60+msgstr ""
61+
62+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97
63+#: qml/Components/Dialogs.qml:122
64+msgid "No"
65+msgstr ""
66+
67+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104
68+#: qml/Components/Dialogs.qml:129
69+msgid "Yes"
70+msgstr ""
71+
72+#: qml/Components/Dialogs.qml:94
73+msgid "Shut down"
74+msgstr ""
75+
76+#: qml/Components/Dialogs.qml:95
77+msgid "Are you sure you want to shut down?"
78+msgstr ""
79+
80+#: qml/Components/Dialogs.qml:119
81+msgid "Reboot"
82+msgstr ""
83+
84+#: qml/Components/Dialogs.qml:120
85+msgid "Are you sure you want to reboot?"
86+msgstr ""
87+
88+#: qml/Components/Dialogs.qml:144
89+msgid "Power"
90+msgstr ""
91+
92+#: qml/Components/Dialogs.qml:145
93+msgid ""
94+"Are you sure you would like\n"
95+"to power off?"
96+msgstr ""
97+
98+#: qml/Components/Dialogs.qml:147
99+msgid "Power off"
100+msgstr ""
101+
102+#: qml/Components/Dialogs.qml:157
103+msgid "Restart"
104+msgstr ""
105+
106+#: qml/Components/Dialogs.qml:167
107+msgid "Cancel"
108+msgstr ""
109+
110+#: qml/Components/EdgeDemoOverlay.qml:151
111+msgid "Skip intro"
112+msgstr ""
113+
114+#: qml/Components/EdgeDemo.qml:112
115+msgid "Right edge"
116+msgstr ""
117+
118+#: qml/Components/EdgeDemo.qml:113
119+msgid "Try swiping from the right edge to unlock the phone"
120+msgstr ""
121+
122+#: qml/Components/EdgeDemo.qml:144
123+msgid "Top edge"
124+msgstr ""
125+
126+#: qml/Components/EdgeDemo.qml:145
127+msgid "Try swiping from the top edge to access the indicators"
128+msgstr ""
129+
130+#: qml/Components/EdgeDemo.qml:170
131+msgid "Close"
132+msgstr ""
133+
134+#: qml/Components/EdgeDemo.qml:171
135+msgid "Swipe up again to close the settings screen"
136+msgstr ""
137+
138+#: qml/Components/EdgeDemo.qml:198
139+msgid "Left edge"
140+msgstr ""
141+
142+#: qml/Components/EdgeDemo.qml:199
143+msgid "Swipe from the left to reveal the launcher for quick access to apps"
144+msgstr ""
145+
146+#: qml/Components/EdgeDemo.qml:226
147+msgid "Well done"
148+msgstr ""
149+
150+#: qml/Components/EdgeDemo.qml:227
151+msgid ""
152+"You have now mastered the edge gestures and can start using the "
153+"phone<br><br>Tap on the screen to start"
154+msgstr ""
155+
156+#: qml/Components/Lockscreen.qml:218
157+msgid "Emergency Call"
158+msgstr ""
159+
160+#: qml/Components/Lockscreen.qml:250
161+msgid "OK"
162+msgstr ""
163+
164+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
165+msgid "See less"
166+msgstr ""
167+
168+#: qml/Dash/GenericScopeView.qml:411
169+msgid "See all"
170+msgstr ""
171+
172+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
173+#: qml/Panel/SearchIndicator.qml:27
174+msgid "Search"
175+msgstr ""
176+
177+#: qml/Dash/PageHeader.qml:268
178+msgid "Settings"
179+msgstr ""
180+
181+#: qml/Dash/PageHeader.qml:275
182+msgid "Remove from Favorites"
183+msgstr ""
184+
185+#: qml/Dash/PageHeader.qml:275
186+msgid "Add to Favorites"
187+msgstr ""
188+
189+#: qml/Dash/Previews/PreviewActionCombo.qml:35
190+msgid "More..."
191+msgstr ""
192+
193+#: qml/Dash/Previews/PreviewActionCombo.qml:35
194+msgid "Less..."
195+msgstr ""
196+
197+#: qml/Dash/Previews/PreviewRatingInput.qml:81
198+msgid "Rate this"
199+msgstr ""
200+
201+#: qml/Dash/Previews/PreviewRatingInput.qml:126
202+msgid "Add a review"
203+msgstr ""
204+
205+#: qml/Dash/Previews/PreviewRatingInput.qml:166
206+msgid "Send"
207+msgstr ""
208+
209+#: qml/Dash/PullToRefreshScopeStyle.qml:55
210+msgid "Pull to refresh…"
211+msgstr ""
212+
213+#: qml/Dash/PullToRefreshScopeStyle.qml:60
214+msgid "Release to refresh…"
215+msgstr ""
216+
217+#: qml/Dash/ScopesOverview.qml:206
218+msgid "Manage Scopes"
219+msgstr ""
220+
221+#: qml/Dash/ScopesOverview.qml:428
222+msgid "Done"
223+msgstr ""
224+
225+#: qml/Dash/ScopesOverview.qml:454
226+msgid "Store"
227+msgstr ""
228+
229+#: qml/Dash/ScopesOverviewTab.qml:36
230+msgid "Favorites"
231+msgstr ""
232+
233+#: qml/Dash/ScopesOverviewTab.qml:54
234+msgid "All"
235+msgstr ""
236+
237+#: qml/Greeter/Greeter.qml:157
238+msgid "Unlock"
239+msgstr ""
240+
241+#: qml/Hud/HudParametrizedActionsPage.qml:139
242+msgid "Confirm"
243+msgstr ""
244+
245+#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
246+msgid "Type or say a command"
247+msgstr ""
248+
249+#: qml/Hud/Hud.qml:84
250+msgid "Loading. Please Wait..."
251+msgstr ""
252+
253+#: qml/Hud/Hud.qml:89
254+msgid "Speak Now..."
255+msgstr ""
256+
257+#: qml/Hud/Hud.qml:94
258+msgid "Speaking..."
259+msgstr ""
260+
261+#: qml/Notifications/NotificationMenuItemFactory.qml:108
262+msgid "Show password"
263+msgstr ""
264+
265+#: qml/Notifications/NotificationMenuItemFactory.qml:124
266+msgid "Enter SIM PIN"
267+msgstr ""
268+
269+#: qml/Notifications/NotificationMenuItemFactory.qml:125
270+msgid "Sorry, incorrect PIN"
271+msgstr ""
272+
273+#: qml/Panel/ActiveCallHint.qml:77
274+msgid "Tap to return to call..."
275+msgstr ""
276+
277+#: qml/Panel/ActiveCallHint.qml:90
278+msgid "Conference"
279+msgstr ""
280+
281+#: qml/Panel/Indicators/MenuItemFactory.qml:600
282+msgid "Nothing is playing"
283+msgstr ""
284+
285+#: qml/Panel/Indicators/MenuItemFactory.qml:748
286+msgid "In queue…"
287+msgstr ""
288+
289+#: qml/Panel/Indicators/MenuItemFactory.qml:752
290+msgid "Downloading"
291+msgstr ""
292+
293+#: qml/Panel/Indicators/MenuItemFactory.qml:754
294+msgid "Paused, tap to resume"
295+msgstr ""
296+
297+#: qml/Panel/Indicators/MenuItemFactory.qml:756
298+msgid "Canceled"
299+msgstr ""
300+
301+#: qml/Panel/Indicators/MenuItemFactory.qml:758
302+msgid "Finished"
303+msgstr ""
304+
305+#: qml/Panel/Indicators/MenuItemFactory.qml:760
306+msgid "Failed, tap to retry"
307+msgstr ""
308+
309+#: qml/Panel/Indicators/ModemInfoItem.qml:105
310+msgid "Unlock SIM"
311+msgstr ""
312+
313+#: qml/Panel/Indicators/RoamingIndication.qml:27
314+msgid "Roaming"
315+msgstr ""
316+
317+#: qml/Shell.qml:340
318+msgid "Enter passphrase"
319+msgstr ""
320+
321+#: qml/Shell.qml:341
322+msgid "Sorry, incorrect passphrase"
323+msgstr ""
324+
325+#: qml/Shell.qml:342
326+msgid "Please re-enter"
327+msgstr ""
328+
329+#: qml/Shell.qml:344
330+msgid "Enter passcode"
331+msgstr ""
332+
333+#: qml/Shell.qml:345
334+msgid "Sorry, incorrect passcode"
335+msgstr ""
336+
337+#: qml/Shell.qml:348
338+#, qt-format
339+msgid "Enter %1"
340+msgstr ""
341+
342+#: qml/Shell.qml:349
343+#, qt-format
344+msgid "Sorry, incorrect %1"
345+msgstr ""
346+
347+#: qml/Shell.qml:384
348+msgid "Sorry, incorrect passphrase."
349+msgstr ""
350+
351+#: qml/Shell.qml:385
352+msgid "Sorry, incorrect passcode."
353+msgstr ""
354+
355+#: qml/Shell.qml:386
356+msgid "This will be your last attempt."
357+msgstr ""
358+
359+#: qml/Shell.qml:388
360+msgid ""
361+"If passphrase is entered incorrectly, your phone will conduct a factory "
362+"reset and all personal data will be deleted."
363+msgstr ""
364+
365+#: qml/Shell.qml:389
366+msgid ""
367+"If passcode is entered incorrectly, your phone will conduct a factory reset "
368+"and all personal data will be deleted."
369+msgstr ""
po/bg.po+96−65
@@ -7,29 +7,49 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-26 18:24+0200\n"
10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
1111"PO-Revision-Date: 2014-04-01 14:08+0000\n"
1212"Last-Translator: Atanas Kovachki <Unknown>\n"
1313"Language-Team: Bulgarian <bg@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-28 06:29+0000\n"
18−"X-Generator: Launchpad (build 17174)\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
18+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"
19+"X-Generator: Launchpad (build 17196)\n"
1920
20−#: plugins/LightDM/Greeter.cpp:129
21+#: plugins/LightDM/Greeter.cpp:130
2122msgid "Password: "
2223msgstr ""
2324
24−#: plugins/Unity/Launcher/launcheritem.cpp:43
25−#: plugins/Unity/Launcher/launcheritem.cpp:73
25+#: plugins/Unity/Launcher/launcheritem.cpp:45
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
2627msgid "Pin shortcut"
2728msgstr ""
2829
29−#: plugins/Unity/Launcher/launcheritem.cpp:73
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
3031msgid "Unpin shortcut"
3132msgstr ""
3233
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
3353#: qml/Components/Dialogs.qml:70
3454msgid "Log out"
3555msgstr ""
@@ -74,11 +94,15 @@ msgid ""
7494"to power off?"
7595msgstr ""
7696
77−#: qml/Components/Dialogs.qml:144
97+#: qml/Components/Dialogs.qml:147
7898msgid "Power off"
7999msgstr ""
80100
81−#: qml/Components/Dialogs.qml:162
101+#: qml/Components/Dialogs.qml:157
102+msgid "Restart"
103+msgstr ""
104+
105+#: qml/Components/Dialogs.qml:167
82106msgid "Cancel"
83107msgstr ""
84108
@@ -135,60 +159,44 @@ msgid ""
135159"phone<br><br>Tap on the screen to start"
136160msgstr ""
137161
138−#: qml/Components/Lockscreen.qml:167
139−msgid "Please wait"
140−msgstr ""
141−
142−#: qml/Components/Lockscreen.qml:172
143−msgid "Too many incorrect attempts"
144−msgstr ""
145−
146−#: qml/Components/Lockscreen.qml:206
162+#: qml/Components/Lockscreen.qml:218
147163msgid "Emergency Call"
148164msgstr "Спешно повикване"
149165
150−#: qml/Components/Lockscreen.qml:226
166+#: qml/Components/Lockscreen.qml:250
151167msgid "OK"
152168msgstr ""
153169
154−#: qml/Components/PassphraseLockscreen.qml:61
155−#, qt-format
156−msgid "Hello %1"
157−msgstr "Здравей, %1"
158−
159−#: qml/Components/PassphraseLockscreen.qml:61
160−msgid "Hello"
161−msgstr "Здравей"
162−
163−#: qml/Dash/GenericScopeView.qml:361
170+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
164171msgid "See less"
165172msgstr ""
166173
167−#: qml/Dash/GenericScopeView.qml:361
174+#: qml/Dash/GenericScopeView.qml:411
168175msgid "See all"
169176msgstr ""
170177
171−#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
178+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
179+#: qml/Panel/SearchIndicator.qml:27
172180msgid "Search"
173181msgstr "Търсене"
174182
175−#: qml/Dash/PageHeader.qml:270
183+#: qml/Dash/PageHeader.qml:268
176184msgid "Settings"
177185msgstr ""
178186
179−#: qml/Dash/PageHeader.qml:279
187+#: qml/Dash/PageHeader.qml:275
180188msgid "Remove from Favorites"
181189msgstr ""
182190
183−#: qml/Dash/PageHeader.qml:279
191+#: qml/Dash/PageHeader.qml:275
184192msgid "Add to Favorites"
185193msgstr ""
186194
187−#: qml/Dash/Previews/PreviewActionCombo.qml:34
195+#: qml/Dash/Previews/PreviewActionCombo.qml:35
188196msgid "More..."
189197msgstr ""
190198
191−#: qml/Dash/Previews/PreviewActionCombo.qml:34
199+#: qml/Dash/Previews/PreviewActionCombo.qml:35
192200msgid "Less..."
193201msgstr "По-малко..."
194202
@@ -204,15 +212,23 @@ msgstr "Добави отзив"
204212msgid "Send"
205213msgstr "Изпрати"
206214
207−#: qml/Dash/ScopesOverview.qml:201
208−msgid "Manage Dash"
215+#: qml/Dash/PullToRefreshScopeStyle.qml:55
216+msgid "Pull to refresh…"
217+msgstr ""
218+
219+#: qml/Dash/PullToRefreshScopeStyle.qml:60
220+msgid "Release to refresh…"
221+msgstr ""
222+
223+#: qml/Dash/ScopesOverview.qml:206
224+msgid "Manage Scopes"
209225msgstr ""
210226
211−#: qml/Dash/ScopesOverview.qml:408
227+#: qml/Dash/ScopesOverview.qml:428
212228msgid "Done"
213229msgstr ""
214230
215−#: qml/Dash/ScopesOverview.qml:434
231+#: qml/Dash/ScopesOverview.qml:454
216232msgid "Store"
217233msgstr ""
218234
@@ -225,10 +241,10 @@ msgid "All"
225241msgstr ""
226242
227243#: qml/Greeter/Greeter.qml:157
228−msgid "Swipe to unlock"
244+msgid "Unlock"
229245msgstr ""
230246
231−#: qml/Hud/HudParametrizedActionsPage.qml:132
247+#: qml/Hud/HudParametrizedActionsPage.qml:139
232248msgid "Confirm"
233249msgstr "Потвърди"
234250
@@ -248,15 +264,15 @@ msgstr "Говорете сега..."
248264msgid "Speaking..."
249265msgstr "Говорете..."
250266
251−#: qml/Notifications/NotificationMenuItemFactory.qml:105
267+#: qml/Notifications/NotificationMenuItemFactory.qml:108
252268msgid "Show password"
253269msgstr "Покажи паролата"
254270
255−#: qml/Notifications/NotificationMenuItemFactory.qml:120
271+#: qml/Notifications/NotificationMenuItemFactory.qml:124
256272msgid "Enter SIM PIN"
257273msgstr ""
258274
259−#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
275+#: qml/Notifications/NotificationMenuItemFactory.qml:125
260276msgid "Sorry, incorrect PIN"
261277msgstr ""
262278
@@ -268,27 +284,31 @@ msgstr ""
268284msgid "Conference"
269285msgstr ""
270286
271−#: qml/Panel/Indicators/MenuItemFactory.qml:651
287+#: qml/Panel/Indicators/MenuItemFactory.qml:600
288+msgid "Nothing is playing"
289+msgstr ""
290+
291+#: qml/Panel/Indicators/MenuItemFactory.qml:748
272292msgid "In queue…"
273293msgstr ""
274294
275−#: qml/Panel/Indicators/MenuItemFactory.qml:655
295+#: qml/Panel/Indicators/MenuItemFactory.qml:752
276296msgid "Downloading"
277297msgstr ""
278298
279−#: qml/Panel/Indicators/MenuItemFactory.qml:657
299+#: qml/Panel/Indicators/MenuItemFactory.qml:754
280300msgid "Paused, tap to resume"
281301msgstr ""
282302
283−#: qml/Panel/Indicators/MenuItemFactory.qml:659
303+#: qml/Panel/Indicators/MenuItemFactory.qml:756
284304msgid "Canceled"
285305msgstr ""
286306
287−#: qml/Panel/Indicators/MenuItemFactory.qml:661
307+#: qml/Panel/Indicators/MenuItemFactory.qml:758
288308msgid "Finished"
289309msgstr ""
290310
291−#: qml/Panel/Indicators/MenuItemFactory.qml:663
311+#: qml/Panel/Indicators/MenuItemFactory.qml:760
292312msgid "Failed, tap to retry"
293313msgstr ""
294314
@@ -300,52 +320,63 @@ msgstr ""
300320msgid "Roaming"
301321msgstr ""
302322
303−#: qml/Shell.qml:266
304−msgid "Enter your passphrase"
323+#: qml/Shell.qml:340
324+msgid "Enter passphrase"
305325msgstr ""
306326
307−#: qml/Shell.qml:267
327+#: qml/Shell.qml:341
308328msgid "Sorry, incorrect passphrase"
309329msgstr ""
310330
311−#: qml/Shell.qml:282
312−msgid "Enter your passcode"
331+#: qml/Shell.qml:342
332+msgid "Please re-enter"
333+msgstr ""
334+
335+#: qml/Shell.qml:344
336+msgid "Enter passcode"
313337msgstr ""
314338
315−#: qml/Shell.qml:283
339+#: qml/Shell.qml:345
316340msgid "Sorry, incorrect passcode"
317341msgstr ""
318342
319−#: qml/Shell.qml:273
343+#: qml/Shell.qml:348
320344#, qt-format
321−msgid "Enter your %1"
345+msgid "Enter %1"
322346msgstr ""
323347
324−#: qml/Shell.qml:274
348+#: qml/Shell.qml:349
325349#, qt-format
326350msgid "Sorry, incorrect %1"
327351msgstr ""
328352
329−#: qml/Shell.qml:310
353+#: qml/Shell.qml:384
330354msgid "Sorry, incorrect passphrase."
331355msgstr ""
332356
333−#: qml/Shell.qml:311
357+#: qml/Shell.qml:385
334358msgid "Sorry, incorrect passcode."
335359msgstr ""
336360
337−#: qml/Shell.qml:312
361+#: qml/Shell.qml:386
338362msgid "This will be your last attempt."
339363msgstr ""
340364
341−#: qml/Shell.qml:314
365+#: qml/Shell.qml:388
342366msgid ""
343367"If passphrase is entered incorrectly, your phone will conduct a factory "
344368"reset and all personal data will be deleted."
345369msgstr ""
346370
347−#: qml/Shell.qml:315
371+#: qml/Shell.qml:389
348372msgid ""
349373"If passcode is entered incorrectly, your phone will conduct a factory reset "
350374"and all personal data will be deleted."
351375msgstr ""
376+
377+#~ msgid "Hello"
378+#~ msgstr "Здравей"
379+
380+#, qt-format
381+#~ msgid "Hello %1"
382+#~ msgstr "Здравей, %1"
po/br.po+137−90
@@ -7,78 +7,108 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-26 18:24+0200\n"
11−"PO-Revision-Date: 2014-08-26 08:28+0000\n"
10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
11+"PO-Revision-Date: 2014-10-03 06:52+0000\n"
1212"Last-Translator: Fohanno Thierry <thierry.fohanno@ofis-bzh.org>\n"
1313"Language-Team: Breton <br@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-28 06:29+0000\n"
18−"X-Generator: Launchpad (build 17174)\n"
17+"Plural-Forms: nplurals=2; plural=n > 1;\n"
18+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"
19+"X-Generator: Launchpad (build 17196)\n"
1920
20−#: plugins/LightDM/Greeter.cpp:129
21+#: plugins/LightDM/Greeter.cpp:130
2122msgid "Password: "
2223msgstr "Ger-tremen : "
2324
24−#: plugins/Unity/Launcher/launcheritem.cpp:43
25−#: plugins/Unity/Launcher/launcheritem.cpp:73
25+#: plugins/Unity/Launcher/launcheritem.cpp:45
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
2627msgid "Pin shortcut"
2728msgstr "Spilhennañ ar verradenn"
2829
29−#: plugins/Unity/Launcher/launcheritem.cpp:73
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
3031msgid "Unpin shortcut"
3132msgstr "Dispilhennañ ar verradenn"
3233
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr "Benveg prennet"
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+"Prennet eo bet ho penveg abalamour da re a daolioù-esae c'hwitet evit merkañ "
42+"ho frazenn-dremen."
43+
44+#: qml/Components/DelayedLockscreen.qml:63
45+msgid "You have been locked out due to too many failed passcode attempts."
46+msgstr ""
47+"Prennet eo bet ho penveg abalamour da re a daolioù-esae evit merkañ ho kod-"
48+"tremen."
49+
50+#: qml/Components/DelayedLockscreen.qml:72
51+#, qt-format
52+msgid "Please wait %1 minute and then try again…"
53+msgid_plural "Please wait %1 minutes and then try again…"
54+msgstr[0] "Gortozit %1 vunutenn, mar plij, hag esaeit en-dro..."
55+msgstr[1] "Gortozit %1 a vunutoù, mar plij, hag esaeit en-dro..."
56+
3357#: qml/Components/Dialogs.qml:70
3458msgid "Log out"
35−msgstr ""
59+msgstr "Digevreañ"
3660
3761#: qml/Components/Dialogs.qml:71
3862msgid "Are you sure you want to log out?"
39−msgstr ""
63+msgstr "Ha sur oc'h e fell deoc'h digevreañ ?"
4064
4165#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97
4266#: qml/Components/Dialogs.qml:122
4367msgid "No"
44−msgstr ""
68+msgstr "N'on ket"
4569
4670#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104
4771#: qml/Components/Dialogs.qml:129
4872msgid "Yes"
49−msgstr ""
73+msgstr "Ya"
5074
5175#: qml/Components/Dialogs.qml:94
5276msgid "Shut down"
53−msgstr ""
77+msgstr "Lazhañ ar benveg"
5478
5579#: qml/Components/Dialogs.qml:95
5680msgid "Are you sure you want to shut down?"
57−msgstr ""
81+msgstr "Ha sur oc'h e fell deoc'h lazhañ ar benveg ?"
5882
5983#: qml/Components/Dialogs.qml:119
6084msgid "Reboot"
61−msgstr ""
85+msgstr "Adloc'hañ"
6286
6387#: qml/Components/Dialogs.qml:120
6488msgid "Are you sure you want to reboot?"
65−msgstr ""
89+msgstr "Ha sur oc'h e fell deoc'h adloc'hañ ?"
6690
6791#: qml/Components/Dialogs.qml:144
6892msgid "Power"
69−msgstr ""
93+msgstr "Tredan"
7094
7195#: qml/Components/Dialogs.qml:145
7296msgid ""
7397"Are you sure you would like\n"
7498"to power off?"
7599msgstr ""
100+"Ha sur oc'h e fell deoc'h\n"
101+"troc'hañ an tredan ?"
76102
77−#: qml/Components/Dialogs.qml:144
103+#: qml/Components/Dialogs.qml:147
78104msgid "Power off"
79105msgstr "Lazhañ"
80106
81−#: qml/Components/Dialogs.qml:162
107+#: qml/Components/Dialogs.qml:157
108+msgid "Restart"
109+msgstr "Adloc'hañ"
110+
111+#: qml/Components/Dialogs.qml:167
82112msgid "Cancel"
83113msgstr "Nullañ"
84114
@@ -135,60 +165,44 @@ msgstr ""
135165"Mestroniañ a rit ar jestroù ha gallout a rit kregiñ da implijout ar "
136166"pellgomzer<br><br>Touchit d'ar skramm evit kregiñ ganti"
137167
138−#: qml/Components/Lockscreen.qml:167
139−msgid "Please wait"
140−msgstr "Gortozit, mar plij"
141−
142−#: qml/Components/Lockscreen.qml:172
143−msgid "Too many incorrect attempts"
144−msgstr "Re a daolioù-esae direizh"
145−
146−#: qml/Components/Lockscreen.qml:206
168+#: qml/Components/Lockscreen.qml:218
147169msgid "Emergency Call"
148170msgstr "Pellgomzadenn vallus"
149171
150−#: qml/Components/Lockscreen.qml:226
172+#: qml/Components/Lockscreen.qml:250
151173msgid "OK"
152174msgstr "Mat eo"
153175
154−#: qml/Components/PassphraseLockscreen.qml:61
155−#, qt-format
156−msgid "Hello %1"
157−msgstr "Demat %1"
158−
159−#: qml/Components/PassphraseLockscreen.qml:61
160−msgid "Hello"
161−msgstr "Demat"
162−
163−#: qml/Dash/GenericScopeView.qml:361
176+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
164177msgid "See less"
165178msgstr "Gwelet nebeutoc'h"
166179
167−#: qml/Dash/GenericScopeView.qml:361
180+#: qml/Dash/GenericScopeView.qml:411
168181msgid "See all"
169182msgstr "Gwelet pep tra"
170183
171−#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
184+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
185+#: qml/Panel/SearchIndicator.qml:27
172186msgid "Search"
173187msgstr "Klask"
174188
175−#: qml/Dash/PageHeader.qml:270
189+#: qml/Dash/PageHeader.qml:268
176190msgid "Settings"
177−msgstr ""
191+msgstr "Arventennoù"
178192
179−#: qml/Dash/PageHeader.qml:279
193+#: qml/Dash/PageHeader.qml:275
180194msgid "Remove from Favorites"
181−msgstr ""
195+msgstr "Lemel eus ar sinedoù"
182196
183−#: qml/Dash/PageHeader.qml:279
197+#: qml/Dash/PageHeader.qml:275
184198msgid "Add to Favorites"
185−msgstr ""
199+msgstr "Ouzhpennañ d'ar sinedoù"
186200
187−#: qml/Dash/Previews/PreviewActionCombo.qml:34
201+#: qml/Dash/Previews/PreviewActionCombo.qml:35
188202msgid "More..."
189203msgstr "Muioc'h..."
190204
191−#: qml/Dash/Previews/PreviewActionCombo.qml:34
205+#: qml/Dash/Previews/PreviewActionCombo.qml:35
192206msgid "Less..."
193207msgstr "Nebeutoc'h..."
194208
@@ -204,15 +218,23 @@ msgstr "Ouzhpennañ un ali"
204218msgid "Send"
205219msgstr "Kas"
206220
207−#: qml/Dash/ScopesOverview.qml:201
208−msgid "Manage Dash"
209−msgstr "Merañ an daolenn-vourzh"
221+#: qml/Dash/PullToRefreshScopeStyle.qml:55
222+msgid "Pull to refresh…"
223+msgstr ""
224+
225+#: qml/Dash/PullToRefreshScopeStyle.qml:60
226+msgid "Release to refresh…"
227+msgstr ""
210228
211−#: qml/Dash/ScopesOverview.qml:408
229+#: qml/Dash/ScopesOverview.qml:206
230+msgid "Manage Scopes"
231+msgstr "Merañ ar c'hefluskerioù enklask"
232+
233+#: qml/Dash/ScopesOverview.qml:428
212234msgid "Done"
213235msgstr "Graet eo"
214236
215−#: qml/Dash/ScopesOverview.qml:434
237+#: qml/Dash/ScopesOverview.qml:454
216238msgid "Store"
217239msgstr "Enrollañ"
218240
@@ -225,10 +247,10 @@ msgid "All"
225247msgstr "An holl anezho"
226248
227249#: qml/Greeter/Greeter.qml:157
228−msgid "Swipe to unlock"
229−msgstr "Riklañ evit dibrennañ"
250+msgid "Unlock"
251+msgstr "Dibrennañ"
230252
231−#: qml/Hud/HudParametrizedActionsPage.qml:132
253+#: qml/Hud/HudParametrizedActionsPage.qml:139
232254msgid "Confirm"
233255msgstr "Kadarnaat"
234256
@@ -248,15 +270,15 @@ msgstr "Komzit bremañ..."
248270msgid "Speaking..."
249271msgstr "O komz..."
250272
251−#: qml/Notifications/NotificationMenuItemFactory.qml:105
273+#: qml/Notifications/NotificationMenuItemFactory.qml:108
252274msgid "Show password"
253275msgstr "Diskouez ar ger-tremen"
254276
255−#: qml/Notifications/NotificationMenuItemFactory.qml:120
277+#: qml/Notifications/NotificationMenuItemFactory.qml:124
256278msgid "Enter SIM PIN"
257279msgstr "Ebarzhit kod PIN ar gartenn SIM"
258280
259−#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
281+#: qml/Notifications/NotificationMenuItemFactory.qml:125
260282msgid "Sorry, incorrect PIN"
261283msgstr "Siwazh, kod PIN direizh"
262284
@@ -268,27 +290,31 @@ msgstr "Touchit evit distreiñ d'ar bellgomzadenn..."
268290msgid "Conference"
269291msgstr "Kendiviz"
270292
271−#: qml/Panel/Indicators/MenuItemFactory.qml:651
293+#: qml/Panel/Indicators/MenuItemFactory.qml:600
294+msgid "Nothing is playing"
295+msgstr "Ne lenner netra bremañ"
296+
297+#: qml/Panel/Indicators/MenuItemFactory.qml:748
272298msgid "In queue…"
273299msgstr "El lostennad..."
274300
275−#: qml/Panel/Indicators/MenuItemFactory.qml:655
301+#: qml/Panel/Indicators/MenuItemFactory.qml:752
276302msgid "Downloading"
277303msgstr "O pellgargañ"
278304
279−#: qml/Panel/Indicators/MenuItemFactory.qml:657
305+#: qml/Panel/Indicators/MenuItemFactory.qml:754
280306msgid "Paused, tap to resume"
281307msgstr "Ehanet, touchit evit adkregiñ"
282308
283−#: qml/Panel/Indicators/MenuItemFactory.qml:659
309+#: qml/Panel/Indicators/MenuItemFactory.qml:756
284310msgid "Canceled"
285311msgstr "Nullet"
286312
287−#: qml/Panel/Indicators/MenuItemFactory.qml:661
313+#: qml/Panel/Indicators/MenuItemFactory.qml:758
288314msgid "Finished"
289315msgstr "Echu"
290316
291−#: qml/Panel/Indicators/MenuItemFactory.qml:663
317+#: qml/Panel/Indicators/MenuItemFactory.qml:760
292318msgid "Failed, tap to retry"
293319msgstr "C'hwitet, touchit evit adkregiñ"
294320
@@ -300,45 +326,49 @@ msgstr "Dibrennañ ar gartenn SIM"
300326msgid "Roaming"
301327msgstr "O kantren"
302328
303−#: qml/Shell.qml:266
304−msgid "Enter your passphrase"
305−msgstr "Ebarzhit ho frazenn-dremen"
329+#: qml/Shell.qml:340
330+msgid "Enter passphrase"
331+msgstr "Merkañ ar frazenn-dremen"
306332
307−#: qml/Shell.qml:267
333+#: qml/Shell.qml:341
308334msgid "Sorry, incorrect passphrase"
309335msgstr "Siwazh, frazenn-dremen direizh"
310336
311−#: qml/Shell.qml:282
312−msgid "Enter your passcode"
313−msgstr ""
337+#: qml/Shell.qml:342
338+msgid "Please re-enter"
339+msgstr "Adverkañ, mar plij"
340+
341+#: qml/Shell.qml:344
342+msgid "Enter passcode"
343+msgstr "Merkañ ar c'hod-tremen"
314344
315−#: qml/Shell.qml:283
345+#: qml/Shell.qml:345
316346msgid "Sorry, incorrect passcode"
317−msgstr ""
347+msgstr "Digarezit, kod-tremen direizh"
318348
319−#: qml/Shell.qml:273
349+#: qml/Shell.qml:348
320350#, qt-format
321−msgid "Enter your %1"
322−msgstr "Ebarzhit ho %1"
351+msgid "Enter %1"
352+msgstr "Merkañ %1"
323353
324−#: qml/Shell.qml:274
354+#: qml/Shell.qml:349
325355#, qt-format
326356msgid "Sorry, incorrect %1"
327357msgstr "Siwazh, %1 direizh"
328358
329−#: qml/Shell.qml:310
359+#: qml/Shell.qml:384
330360msgid "Sorry, incorrect passphrase."
331361msgstr "Siwazh, frazenn-dremen direizh"
332362
333−#: qml/Shell.qml:311
363+#: qml/Shell.qml:385
334364msgid "Sorry, incorrect passcode."
335365msgstr "Siwazh, kod-tremen direizh"
336366
337−#: qml/Shell.qml:312
367+#: qml/Shell.qml:386
338368msgid "This will be your last attempt."
339369msgstr "Ho taol-esae diwezhañ e vo."
340370
341−#: qml/Shell.qml:314
371+#: qml/Shell.qml:388
342372msgid ""
343373"If passphrase is entered incorrectly, your phone will conduct a factory "
344374"reset and all personal data will be deleted."
@@ -346,7 +376,7 @@ msgstr ""
346376"Ma vez ebarzhet ur frazenn-dremen direizh, e vo adderaouekaet ho pellgomzer "
347377"gant arventennoù al labouradeg hag e vo diverket an holl roadennoù personel"
348378
349−#: qml/Shell.qml:315
379+#: qml/Shell.qml:389
350380msgid ""
351381"If passcode is entered incorrectly, your phone will conduct a factory reset "
352382"and all personal data will be deleted."
@@ -354,11 +384,28 @@ msgstr ""
354384"Ma vez ebarzhet ur c'hod-tremen direizh, e vo adderaouekaet ho pellgomzer "
355385"gant arventennoù al labouradeg hag e vo diverket an holl roadennoù personel."
356386
357−#~ msgid "Are you sure you would like to turn power off?"
358−#~ msgstr "Ha sur oc'h e fell deoc'h lazhañ ar benveg ?"
387+#~ msgid "Hello"
388+#~ msgstr "Demat"
389+
390+#, qt-format
391+#~ msgid "Hello %1"
392+#~ msgstr "Demat %1"
393+
394+#~ msgid "Swipe to unlock"
395+#~ msgstr "Riklañ evit dibrennañ"
396+
397+#~ msgid "Please wait"
398+#~ msgstr "Gortozit, mar plij"
399+
400+#~ msgid "Too many incorrect attempts"
401+#~ msgstr "Re a daolioù-esae direizh"
359402
360−#~ msgid "Restart"
361−#~ msgstr "Adloc'hañ"
403+#~ msgid "Enter your passphrase"
404+#~ msgstr "Ebarzhit ho frazenn-dremen"
405+
406+#, qt-format
407+#~ msgid "Enter your %1"
408+#~ msgstr "Ebarzhit ho %1"
362409
363−#~ msgid "Enter your PIN"
364−#~ msgstr "Ebarzhit ho kod PIN"
410+#~ msgid "Enter your passcode"
411+#~ msgstr "Ebarzhit ho kod-tremen"
po/bs.po+90−65
@@ -7,29 +7,50 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-26 18:24+0200\n"
10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
1111"PO-Revision-Date: 2014-01-16 22:33+0000\n"
1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313"Language-Team: Bosnian <bs@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-28 06:29+0000\n"
18−"X-Generator: Launchpad (build 17174)\n"
17+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
18+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
19+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"
20+"X-Generator: Launchpad (build 17196)\n"
1921
20−#: plugins/LightDM/Greeter.cpp:129
22+#: plugins/LightDM/Greeter.cpp:130
2123msgid "Password: "
2224msgstr ""
2325
24−#: plugins/Unity/Launcher/launcheritem.cpp:43
25−#: plugins/Unity/Launcher/launcheritem.cpp:73
26+#: plugins/Unity/Launcher/launcheritem.cpp:45
27+#: plugins/Unity/Launcher/launcheritem.cpp:91
2628msgid "Pin shortcut"
2729msgstr ""
2830
29−#: plugins/Unity/Launcher/launcheritem.cpp:73
31+#: plugins/Unity/Launcher/launcheritem.cpp:91
3032msgid "Unpin shortcut"
3133msgstr ""
3234
35+#: qml/Components/DelayedLockscreen.qml:47
36+msgid "Device Locked"
37+msgstr ""
38+
39+#: qml/Components/DelayedLockscreen.qml:62
40+msgid "You have been locked out due to too many failed passphrase attempts."
41+msgstr ""
42+
43+#: qml/Components/DelayedLockscreen.qml:63
44+msgid "You have been locked out due to too many failed passcode attempts."
45+msgstr ""
46+
47+#: qml/Components/DelayedLockscreen.qml:72
48+#, qt-format
49+msgid "Please wait %1 minute and then try again…"
50+msgid_plural "Please wait %1 minutes and then try again…"
51+msgstr[0] ""
52+msgstr[1] ""
53+
3354#: qml/Components/Dialogs.qml:70
3455msgid "Log out"
3556msgstr ""
@@ -74,11 +95,15 @@ msgid ""
7495"to power off?"
7596msgstr ""
7697
77−#: qml/Components/Dialogs.qml:144
98+#: qml/Components/Dialogs.qml:147
7899msgid "Power off"
79100msgstr ""
80101
81−#: qml/Components/Dialogs.qml:162
102+#: qml/Components/Dialogs.qml:157
103+msgid "Restart"
104+msgstr ""
105+
106+#: qml/Components/Dialogs.qml:167
82107msgid "Cancel"
83108msgstr ""
84109
@@ -128,60 +153,44 @@ msgid ""
128153"phone<br><br>Tap on the screen to start"
129154msgstr ""
130155
131−#: qml/Components/Lockscreen.qml:167
132−msgid "Please wait"
133−msgstr ""
134−
135−#: qml/Components/Lockscreen.qml:172
136−msgid "Too many incorrect attempts"
137−msgstr ""
138−
139−#: qml/Components/Lockscreen.qml:206
156+#: qml/Components/Lockscreen.qml:218
140157msgid "Emergency Call"
141158msgstr ""
142159
143−#: qml/Components/Lockscreen.qml:226
160+#: qml/Components/Lockscreen.qml:250
144161msgid "OK"
145162msgstr ""
146163
147−#: qml/Components/PassphraseLockscreen.qml:61
148−#, qt-format
149−msgid "Hello %1"
150−msgstr ""
151−
152−#: qml/Components/PassphraseLockscreen.qml:61
153−msgid "Hello"
154−msgstr ""
155−
156−#: qml/Dash/GenericScopeView.qml:361
164+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
157165msgid "See less"
158166msgstr ""
159167
160−#: qml/Dash/GenericScopeView.qml:361
168+#: qml/Dash/GenericScopeView.qml:411
161169msgid "See all"
162170msgstr ""
163171
164−#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
172+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
173+#: qml/Panel/SearchIndicator.qml:27
165174msgid "Search"
166175msgstr ""
167176
168−#: qml/Dash/PageHeader.qml:270
177+#: qml/Dash/PageHeader.qml:268
169178msgid "Settings"
170179msgstr ""
171180
172−#: qml/Dash/PageHeader.qml:279
181+#: qml/Dash/PageHeader.qml:275
173182msgid "Remove from Favorites"
174183msgstr ""
175184
176−#: qml/Dash/PageHeader.qml:279
185+#: qml/Dash/PageHeader.qml:275
177186msgid "Add to Favorites"
178187msgstr ""
179188
180−#: qml/Dash/Previews/PreviewActionCombo.qml:34
189+#: qml/Dash/Previews/PreviewActionCombo.qml:35
181190msgid "More..."
182191msgstr ""
183192
184−#: qml/Dash/Previews/PreviewActionCombo.qml:34
193+#: qml/Dash/Previews/PreviewActionCombo.qml:35
185194msgid "Less..."
186195msgstr ""
187196
@@ -197,15 +206,23 @@ msgstr ""
197206msgid "Send"
198207msgstr ""
199208
200−#: qml/Dash/ScopesOverview.qml:201
201−msgid "Manage Dash"
209+#: qml/Dash/PullToRefreshScopeStyle.qml:55
210+msgid "Pull to refresh…"
211+msgstr ""
212+
213+#: qml/Dash/PullToRefreshScopeStyle.qml:60
214+msgid "Release to refresh…"
215+msgstr ""
216+
217+#: qml/Dash/ScopesOverview.qml:206
218+msgid "Manage Scopes"
202219msgstr ""
203220
204−#: qml/Dash/ScopesOverview.qml:408
221+#: qml/Dash/ScopesOverview.qml:428
205222msgid "Done"
206223msgstr ""
207224
208−#: qml/Dash/ScopesOverview.qml:434
225+#: qml/Dash/ScopesOverview.qml:454
209226msgid "Store"
210227msgstr ""
211228
@@ -218,10 +235,10 @@ msgid "All"
218235msgstr ""
219236
220237#: qml/Greeter/Greeter.qml:157
221−msgid "Swipe to unlock"
238+msgid "Unlock"
222239msgstr ""
223240
224−#: qml/Hud/HudParametrizedActionsPage.qml:132
241+#: qml/Hud/HudParametrizedActionsPage.qml:139
225242msgid "Confirm"
226243msgstr ""
227244
@@ -241,15 +258,15 @@ msgstr ""
241258msgid "Speaking..."
242259msgstr ""
243260
244−#: qml/Notifications/NotificationMenuItemFactory.qml:105
261+#: qml/Notifications/NotificationMenuItemFactory.qml:108
245262msgid "Show password"
246263msgstr ""
247264
248−#: qml/Notifications/NotificationMenuItemFactory.qml:120
265+#: qml/Notifications/NotificationMenuItemFactory.qml:124
249266msgid "Enter SIM PIN"
250267msgstr ""
251268
252−#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
269+#: qml/Notifications/NotificationMenuItemFactory.qml:125
253270msgid "Sorry, incorrect PIN"
254271msgstr ""
255272
@@ -261,27 +278,31 @@ msgstr ""
261278msgid "Conference"
262279msgstr ""
263280
264−#: qml/Panel/Indicators/MenuItemFactory.qml:651
281+#: qml/Panel/Indicators/MenuItemFactory.qml:600
282+msgid "Nothing is playing"
283+msgstr ""
284+
285+#: qml/Panel/Indicators/MenuItemFactory.qml:748
265286msgid "In queue…"
266287msgstr ""
267288
268−#: qml/Panel/Indicators/MenuItemFactory.qml:655
289+#: qml/Panel/Indicators/MenuItemFactory.qml:752
269290msgid "Downloading"
270291msgstr ""
271292
272−#: qml/Panel/Indicators/MenuItemFactory.qml:657
293+#: qml/Panel/Indicators/MenuItemFactory.qml:754
273294msgid "Paused, tap to resume"
274295msgstr ""
275296
276−#: qml/Panel/Indicators/MenuItemFactory.qml:659
297+#: qml/Panel/Indicators/MenuItemFactory.qml:756
277298msgid "Canceled"
278299msgstr ""
279300
280−#: qml/Panel/Indicators/MenuItemFactory.qml:661
301+#: qml/Panel/Indicators/MenuItemFactory.qml:758
281302msgid "Finished"
282303msgstr ""
283304
284−#: qml/Panel/Indicators/MenuItemFactory.qml:663
305+#: qml/Panel/Indicators/MenuItemFactory.qml:760
285306msgid "Failed, tap to retry"
286307msgstr ""
287308
@@ -293,51 +314,55 @@ msgstr ""
293314msgid "Roaming"
294315msgstr ""
295316
296−#: qml/Shell.qml:266
297−msgid "Enter your passphrase"
317+#: qml/Shell.qml:340
318+msgid "Enter passphrase"
298319msgstr ""
299320
300−#: qml/Shell.qml:267
321+#: qml/Shell.qml:341
301322msgid "Sorry, incorrect passphrase"
302323msgstr ""
303324
304−#: qml/Shell.qml:282
305−msgid "Enter your passcode"
325+#: qml/Shell.qml:342
326+msgid "Please re-enter"
327+msgstr ""
328+
329+#: qml/Shell.qml:344
330+msgid "Enter passcode"
306331msgstr ""
307332
308−#: qml/Shell.qml:283
333+#: qml/Shell.qml:345
309334msgid "Sorry, incorrect passcode"
310335msgstr ""
311336
312−#: qml/Shell.qml:273
337+#: qml/Shell.qml:348
313338#, qt-format
314−msgid "Enter your %1"
339+msgid "Enter %1"
315340msgstr ""
316341
317−#: qml/Shell.qml:274
342+#: qml/Shell.qml:349
318343#, qt-format
319344msgid "Sorry, incorrect %1"
320345msgstr ""
321346
322−#: qml/Shell.qml:310
347+#: qml/Shell.qml:384
323348msgid "Sorry, incorrect passphrase."
324349msgstr ""
325350
326−#: qml/Shell.qml:311
351+#: qml/Shell.qml:385
327352msgid "Sorry, incorrect passcode."
328353msgstr ""
329354
330−#: qml/Shell.qml:312
355+#: qml/Shell.qml:386
331356msgid "This will be your last attempt."
332357msgstr ""
333358
334−#: qml/Shell.qml:314
359+#: qml/Shell.qml:388
335360msgid ""
336361"If passphrase is entered incorrectly, your phone will conduct a factory "
337362"reset and all personal data will be deleted."
338363msgstr ""
339364
340−#: qml/Shell.qml:315
365+#: qml/Shell.qml:389
341366msgid ""
342367"If passcode is entered incorrectly, your phone will conduct a factory reset "
343368"and all personal data will be deleted."
po/ca.po+143−95
@@ -7,78 +7,108 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-26 18:24+0200\n"
11−"PO-Revision-Date: 2014-08-27 14:23+0000\n"
10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
11+"PO-Revision-Date: 2014-10-06 12:16+0000\n"
1212"Last-Translator: David Planella <david.planella@ubuntu.com>\n"
1313"Language-Team: Catalan <ca@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-28 06:30+0000\n"
18−"X-Generator: Launchpad (build 17174)\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
18+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"
19+"X-Generator: Launchpad (build 17196)\n"
1920
20−#: plugins/LightDM/Greeter.cpp:129
21+#: plugins/LightDM/Greeter.cpp:130
2122msgid "Password: "
2223msgstr "Contrasenya: "
2324
24−#: plugins/Unity/Launcher/launcheritem.cpp:43
25−#: plugins/Unity/Launcher/launcheritem.cpp:73
25+#: plugins/Unity/Launcher/launcheritem.cpp:45
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
2627msgid "Pin shortcut"
2728msgstr "Enganxa la drecera"
2829
29−#: plugins/Unity/Launcher/launcheritem.cpp:73
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
3031msgid "Unpin shortcut"
3132msgstr "Desenganxa la drecera"
3233
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr "Dispositiu bloquejat"
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+"Se us ha bloquejat l'accés al dispositiu. Heu sobrepassat el nombre "
42+"d'intents d'introducció de la contrasenya."
43+
44+#: qml/Components/DelayedLockscreen.qml:63
45+msgid "You have been locked out due to too many failed passcode attempts."
46+msgstr ""
47+"Se us ha bloquejat l'accés al dispositiu. Heu sobrepassat el nombre "
48+"d'intents d'introducció del codi d'accés."
49+
50+#: qml/Components/DelayedLockscreen.qml:72
51+#, qt-format
52+msgid "Please wait %1 minute and then try again…"
53+msgid_plural "Please wait %1 minutes and then try again…"
54+msgstr[0] "Espereu %1 minut i torneu-ho a intentar..."
55+msgstr[1] "Espereu %1 minuts i torneu-ho a intentar..."
56+
3357#: qml/Components/Dialogs.qml:70
3458msgid "Log out"
35−msgstr ""
59+msgstr "Surt"
3660
3761#: qml/Components/Dialogs.qml:71
3862msgid "Are you sure you want to log out?"
39−msgstr ""
63+msgstr "Segur que voleu sortir?"
4064
4165#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97
4266#: qml/Components/Dialogs.qml:122
4367msgid "No"
44−msgstr ""
68+msgstr "No"
4569
4670#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104
4771#: qml/Components/Dialogs.qml:129
4872msgid "Yes"
49−msgstr ""
73+msgstr "Sí"
5074
5175#: qml/Components/Dialogs.qml:94
5276msgid "Shut down"
53−msgstr ""
77+msgstr "Apaga"
5478
5579#: qml/Components/Dialogs.qml:95
5680msgid "Are you sure you want to shut down?"
57−msgstr ""
81+msgstr "Segur que voleu apagar?"
5882
5983#: qml/Components/Dialogs.qml:119
6084msgid "Reboot"
61−msgstr ""
85+msgstr "Reinicia"
6286
6387#: qml/Components/Dialogs.qml:120
6488msgid "Are you sure you want to reboot?"
65−msgstr ""
89+msgstr "Segur que voleu reiniciar?"
6690
6791#: qml/Components/Dialogs.qml:144
6892msgid "Power"
69−msgstr ""
93+msgstr "Energia"
7094
7195#: qml/Components/Dialogs.qml:145
7296msgid ""
7397"Are you sure you would like\n"
7498"to power off?"
7599msgstr ""
100+"Segur que voleu\n"
101+"apagar?"
76102
77−#: qml/Components/Dialogs.qml:144
103+#: qml/Components/Dialogs.qml:147
78104msgid "Power off"
79−msgstr "Apaga'l"
105+msgstr "Apaga"
80106
81−#: qml/Components/Dialogs.qml:162
107+#: qml/Components/Dialogs.qml:157
108+msgid "Restart"
109+msgstr "Reinicia"
110+
111+#: qml/Components/Dialogs.qml:167
82112msgid "Cancel"
83113msgstr "Cancel·la"
84114
@@ -136,60 +166,44 @@ msgstr ""
136166"Ja heu après com utilitzar els gestos de les vores per fer servir el "
137167"telèfon<br><br>Feu un toc a la pantalla per començar"
138168
139−#: qml/Components/Lockscreen.qml:167
140−msgid "Please wait"
141−msgstr "Espereu"
142−
143−#: qml/Components/Lockscreen.qml:172
144−msgid "Too many incorrect attempts"
145−msgstr "Massa intents incorrectes"
146−
147−#: qml/Components/Lockscreen.qml:206
169+#: qml/Components/Lockscreen.qml:218
148170msgid "Emergency Call"
149171msgstr "Trucada d'emergència"
150172
151−#: qml/Components/Lockscreen.qml:226
173+#: qml/Components/Lockscreen.qml:250
152174msgid "OK"
153175msgstr "D'acord"
154176
155−#: qml/Components/PassphraseLockscreen.qml:61
156−#, qt-format
157−msgid "Hello %1"
158−msgstr "Hola %1"
159−
160−#: qml/Components/PassphraseLockscreen.qml:61
161−msgid "Hello"
162−msgstr "Hola"
163−
164−#: qml/Dash/GenericScopeView.qml:361
177+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
165178msgid "See less"
166179msgstr "Mostra'n menys"
167180
168−#: qml/Dash/GenericScopeView.qml:361
181+#: qml/Dash/GenericScopeView.qml:411
169182msgid "See all"
170183msgstr "Mostra-ho tot"
171184
172−#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
185+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
186+#: qml/Panel/SearchIndicator.qml:27
173187msgid "Search"
174188msgstr "Cerca"
175189
176−#: qml/Dash/PageHeader.qml:270
190+#: qml/Dash/PageHeader.qml:268
177191msgid "Settings"
178−msgstr ""
192+msgstr "Paràmetres"
179193
180−#: qml/Dash/PageHeader.qml:279
194+#: qml/Dash/PageHeader.qml:275
181195msgid "Remove from Favorites"
182−msgstr ""
196+msgstr "Suprimeix dels preferits"
183197
184−#: qml/Dash/PageHeader.qml:279
198+#: qml/Dash/PageHeader.qml:275
185199msgid "Add to Favorites"
186−msgstr ""
200+msgstr "Afegeix als preferits"
187201
188−#: qml/Dash/Previews/PreviewActionCombo.qml:34
202+#: qml/Dash/Previews/PreviewActionCombo.qml:35
189203msgid "More..."
190204msgstr "Més..."
191205
192−#: qml/Dash/Previews/PreviewActionCombo.qml:34
206+#: qml/Dash/Previews/PreviewActionCombo.qml:35
193207msgid "Less..."
194208msgstr "Menys..."
195209
@@ -205,15 +219,23 @@ msgstr "Afegiu una ressenya"
205219msgid "Send"
206220msgstr "Envia"
207221
208−#: qml/Dash/ScopesOverview.qml:201
209−msgid "Manage Dash"
210−msgstr "Gestiona el tauler"
222+#: qml/Dash/PullToRefreshScopeStyle.qml:55
223+msgid "Pull to refresh…"
224+msgstr ""
211225
212−#: qml/Dash/ScopesOverview.qml:408
226+#: qml/Dash/PullToRefreshScopeStyle.qml:60
227+msgid "Release to refresh…"
228+msgstr ""
229+
230+#: qml/Dash/ScopesOverview.qml:206
231+msgid "Manage Scopes"
232+msgstr "Gestioneu les lents"
233+
234+#: qml/Dash/ScopesOverview.qml:428
213235msgid "Done"
214236msgstr "Fet"
215237
216−#: qml/Dash/ScopesOverview.qml:434
238+#: qml/Dash/ScopesOverview.qml:454
217239msgid "Store"
218240msgstr "Botiga"
219241
@@ -226,10 +248,10 @@ msgid "All"
226248msgstr "Totes"
227249
228250#: qml/Greeter/Greeter.qml:157
229−msgid "Swipe to unlock"
230−msgstr "Feu lliscar el dit per desbloquejar"
251+msgid "Unlock"
252+msgstr "Desbloca"
231253
232−#: qml/Hud/HudParametrizedActionsPage.qml:132
254+#: qml/Hud/HudParametrizedActionsPage.qml:139
233255msgid "Confirm"
234256msgstr "Confirma"
235257
@@ -249,15 +271,15 @@ msgstr "Parleu..."
249271msgid "Speaking..."
250272msgstr "S'està parlant..."
251273
252−#: qml/Notifications/NotificationMenuItemFactory.qml:105
274+#: qml/Notifications/NotificationMenuItemFactory.qml:108
253275msgid "Show password"
254276msgstr "Mostra la contrasenya"
255277
256−#: qml/Notifications/NotificationMenuItemFactory.qml:120
278+#: qml/Notifications/NotificationMenuItemFactory.qml:124
257279msgid "Enter SIM PIN"
258−msgstr "Introduïu el PIN de la tarjeta SIM"
280+msgstr "Introduïu el PIN de la targeta SIM"
259281
260−#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
282+#: qml/Notifications/NotificationMenuItemFactory.qml:125
261283msgid "Sorry, incorrect PIN"
262284msgstr "El PIN no és correcte"
263285
@@ -269,27 +291,31 @@ msgstr "Feu un toc per tornar a la trucada..."
269291msgid "Conference"
270292msgstr "Conferència"
271293
272−#: qml/Panel/Indicators/MenuItemFactory.qml:651
294+#: qml/Panel/Indicators/MenuItemFactory.qml:600
295+msgid "Nothing is playing"
296+msgstr "No s'està reproduint res"
297+
298+#: qml/Panel/Indicators/MenuItemFactory.qml:748
273299msgid "In queue…"
274300msgstr "A la cua..."
275301
276−#: qml/Panel/Indicators/MenuItemFactory.qml:655
302+#: qml/Panel/Indicators/MenuItemFactory.qml:752
277303msgid "Downloading"
278304msgstr "S'està baixant"
279305
280−#: qml/Panel/Indicators/MenuItemFactory.qml:657
306+#: qml/Panel/Indicators/MenuItemFactory.qml:754
281307msgid "Paused, tap to resume"
282308msgstr "En pausa, feu un toc per continuar"
283309
284−#: qml/Panel/Indicators/MenuItemFactory.qml:659
310+#: qml/Panel/Indicators/MenuItemFactory.qml:756
285311msgid "Canceled"
286312msgstr "S'ha cancel·lat"
287313
288−#: qml/Panel/Indicators/MenuItemFactory.qml:661
314+#: qml/Panel/Indicators/MenuItemFactory.qml:758
289315msgid "Finished"
290316msgstr "S'ha finalitzat"
291317
292−#: qml/Panel/Indicators/MenuItemFactory.qml:663
318+#: qml/Panel/Indicators/MenuItemFactory.qml:760
293319msgid "Failed, tap to retry"
294320msgstr "Ha fallat, feu un toc per tornar-ho a intentar"
295321
@@ -301,45 +327,49 @@ msgstr "Desbloca la SIM"
301327msgid "Roaming"
302328msgstr "Itinerància"
303329
304−#: qml/Shell.qml:266
305−msgid "Enter your passphrase"
306−msgstr "Escriviu la contrasenya"
330+#: qml/Shell.qml:340
331+msgid "Enter passphrase"
332+msgstr "Introduïu la contrasenya"
307333
308−#: qml/Shell.qml:267
334+#: qml/Shell.qml:341
309335msgid "Sorry, incorrect passphrase"
310336msgstr "La contrasenya no és correcta"
311337
312−#: qml/Shell.qml:282
313−msgid "Enter your passcode"
314−msgstr ""
338+#: qml/Shell.qml:342
339+msgid "Please re-enter"
340+msgstr "Torneu-ho a introduir"
341+
342+#: qml/Shell.qml:344
343+msgid "Enter passcode"
344+msgstr "Introduïu el codi d'accés"
315345
316−#: qml/Shell.qml:283
346+#: qml/Shell.qml:345
317347msgid "Sorry, incorrect passcode"
318−msgstr ""
348+msgstr "El codi d'accés no és correcte"
319349
320−#: qml/Shell.qml:273
350+#: qml/Shell.qml:348
321351#, qt-format
322−msgid "Enter your %1"
323−msgstr "Introduïu la %1"
352+msgid "Enter %1"
353+msgstr "Introduïu: %1"
324354
325−#: qml/Shell.qml:274
355+#: qml/Shell.qml:349
326356#, qt-format
327357msgid "Sorry, incorrect %1"
328358msgstr "Incorrecte (%1)"
329359
330−#: qml/Shell.qml:310
360+#: qml/Shell.qml:384
331361msgid "Sorry, incorrect passphrase."
332362msgstr "La contrasenya és incorrecta"
333363
334−#: qml/Shell.qml:311
364+#: qml/Shell.qml:385
335365msgid "Sorry, incorrect passcode."
336−msgstr "La clau és incorrecta"
366+msgstr "El codi d'accés no és correcte"
337367
338−#: qml/Shell.qml:312
368+#: qml/Shell.qml:386
339369msgid "This will be your last attempt."
340370msgstr "Aquest serà el darrer intent."
341371
342−#: qml/Shell.qml:314
372+#: qml/Shell.qml:388
343373msgid ""
344374"If passphrase is entered incorrectly, your phone will conduct a factory "
345375"reset and all personal data will be deleted."
@@ -348,19 +378,37 @@ msgstr ""
348378"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
349379"personals."
350380
351−#: qml/Shell.qml:315
381+#: qml/Shell.qml:389
352382msgid ""
353383"If passcode is entered incorrectly, your phone will conduct a factory reset "
354384"and all personal data will be deleted."
355385msgstr ""
356−"Si la clau s'introdueix de manera incorrecta, el telèfon es reinicialitzarà "
357−"a l'estat de fàbrica i se suprimiran totes les dades personals."
386+"Si el codi d'accés s'introdueix de manera incorrecta, el telèfon es "
387+"reinicialitzarà a l'estat de fàbrica i se suprimiran totes les dades "
388+"personals."
389+
390+#~ msgid "Hello"
391+#~ msgstr "Hola"
392+
393+#, qt-format
394+#~ msgid "Hello %1"
395+#~ msgstr "Hola %1"
396+
397+#~ msgid "Swipe to unlock"
398+#~ msgstr "Feu lliscar el dit per desbloquejar"
399+
400+#~ msgid "Please wait"
401+#~ msgstr "Espereu"
358402
359−#~ msgid "Are you sure you would like to turn power off?"
360−#~ msgstr "Segur que voleu apagar el dispositiu?"
403+#~ msgid "Too many incorrect attempts"
404+#~ msgstr "Massa intents incorrectes"
405+
406+#, qt-format
407+#~ msgid "Enter your %1"
408+#~ msgstr "Introduïu la %1"
361409
362−#~ msgid "Restart"
363−#~ msgstr "Reinicia'l"
410+#~ msgid "Enter your passphrase"
411+#~ msgstr "Escriviu la contrasenya"
364412
365−#~ msgid "Enter your PIN"
366−#~ msgstr "Escriviu el PIN"
413+#~ msgid "Enter your passcode"
414+#~ msgstr "Introduïu el codi d'accés"
po/ckb.po+96−65
@@ -7,29 +7,49 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-26 18:24+0200\n"
10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
1111"PO-Revision-Date: 2014-01-21 11:05+0000\n"
1212"Last-Translator: Aras <aras.noori@gmail.com>\n"
1313"Language-Team: Kurdish (Sorani) <ckb@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-28 06:30+0000\n"
18−"X-Generator: Launchpad (build 17174)\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"
19+"X-Generator: Launchpad (build 17196)\n"
1920
20−#: plugins/LightDM/Greeter.cpp:129
21+#: plugins/LightDM/Greeter.cpp:130
2122msgid "Password: "
2223msgstr ""
2324
24−#: plugins/Unity/Launcher/launcheritem.cpp:43
25−#: plugins/Unity/Launcher/launcheritem.cpp:73
25+#: plugins/Unity/Launcher/launcheritem.cpp:45
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
2627msgid "Pin shortcut"
2728msgstr ""
2829
29−#: plugins/Unity/Launcher/launcheritem.cpp:73
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
3031msgid "Unpin shortcut"
3132msgstr ""
3233
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
3353#: qml/Components/Dialogs.qml:70
3454msgid "Log out"
3555msgstr ""
@@ -74,11 +94,15 @@ msgid ""
7494"to power off?"
7595msgstr ""
7696
77−#: qml/Components/Dialogs.qml:144
97+#: qml/Components/Dialogs.qml:147
7898msgid "Power off"
7999msgstr ""
80100
81−#: qml/Components/Dialogs.qml:162
101+#: qml/Components/Dialogs.qml:157
102+msgid "Restart"
103+msgstr ""
104+
105+#: qml/Components/Dialogs.qml:167
82106msgid "Cancel"
83107msgstr ""
84108
@@ -128,60 +152,44 @@ msgid ""
128152"phone<br><br>Tap on the screen to start"
129153msgstr ""
130154
131−#: qml/Components/Lockscreen.qml:167
132−msgid "Please wait"
133−msgstr ""
134−
135−#: qml/Components/Lockscreen.qml:172
136−msgid "Too many incorrect attempts"
137−msgstr ""
138−
139−#: qml/Components/Lockscreen.qml:206
155+#: qml/Components/Lockscreen.qml:218
140156msgid "Emergency Call"
141157msgstr "هێڵی فریاگوزاری"
142158
143−#: qml/Components/Lockscreen.qml:226
159+#: qml/Components/Lockscreen.qml:250
144160msgid "OK"
145161msgstr ""
146162
147−#: qml/Components/PassphraseLockscreen.qml:61
148−#, qt-format
149−msgid "Hello %1"
150−msgstr "سڵاو %1"
151−
152−#: qml/Components/PassphraseLockscreen.qml:61
153−msgid "Hello"
154−msgstr "سڵاو"
155−
156−#: qml/Dash/GenericScopeView.qml:361
163+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
157164msgid "See less"
158165msgstr ""
159166
160−#: qml/Dash/GenericScopeView.qml:361
167+#: qml/Dash/GenericScopeView.qml:411
161168msgid "See all"
162169msgstr ""
163170
164−#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
171+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
172+#: qml/Panel/SearchIndicator.qml:27
165173msgid "Search"
166174msgstr "گەڕان"
167175
168−#: qml/Dash/PageHeader.qml:270
176+#: qml/Dash/PageHeader.qml:268
169177msgid "Settings"
170178msgstr ""
171179
172−#: qml/Dash/PageHeader.qml:279
180+#: qml/Dash/PageHeader.qml:275
173181msgid "Remove from Favorites"
174182msgstr ""
175183
176−#: qml/Dash/PageHeader.qml:279
184+#: qml/Dash/PageHeader.qml:275
177185msgid "Add to Favorites"
178186msgstr ""
179187
180−#: qml/Dash/Previews/PreviewActionCombo.qml:34
188+#: qml/Dash/Previews/PreviewActionCombo.qml:35
181189msgid "More..."
182190msgstr ""
183191
184−#: qml/Dash/Previews/PreviewActionCombo.qml:34
192+#: qml/Dash/Previews/PreviewActionCombo.qml:35
185193msgid "Less..."
186194msgstr ""
187195
@@ -197,15 +205,23 @@ msgstr "پێداچوونەوە زۆر بکە"
197205msgid "Send"
198206msgstr "ناردن"
199207
200−#: qml/Dash/ScopesOverview.qml:201
201−msgid "Manage Dash"
208+#: qml/Dash/PullToRefreshScopeStyle.qml:55
209+msgid "Pull to refresh…"
210+msgstr ""
211+
212+#: qml/Dash/PullToRefreshScopeStyle.qml:60
213+msgid "Release to refresh…"
214+msgstr ""
215+
216+#: qml/Dash/ScopesOverview.qml:206
217+msgid "Manage Scopes"
202218msgstr ""
203219
204−#: qml/Dash/ScopesOverview.qml:408
220+#: qml/Dash/ScopesOverview.qml:428
205221msgid "Done"
206222msgstr ""
207223
208−#: qml/Dash/ScopesOverview.qml:434
224+#: qml/Dash/ScopesOverview.qml:454
209225msgid "Store"
210226msgstr ""
211227
@@ -218,10 +234,10 @@ msgid "All"
218234msgstr ""
219235
220236#: qml/Greeter/Greeter.qml:157
221−msgid "Swipe to unlock"
237+msgid "Unlock"
222238msgstr ""
223239
224−#: qml/Hud/HudParametrizedActionsPage.qml:132
240+#: qml/Hud/HudParametrizedActionsPage.qml:139
225241msgid "Confirm"
226242msgstr "پشتڕاستکردنەوە"
227243
@@ -241,15 +257,15 @@ msgstr "ئێستا قسە بکە"
241257msgid "Speaking..."
242258msgstr "قسە دەکات..."
243259
244−#: qml/Notifications/NotificationMenuItemFactory.qml:105
260+#: qml/Notifications/NotificationMenuItemFactory.qml:108
245261msgid "Show password"
246262msgstr "تێپەڕەوشە پیشان بدە"
247263
248−#: qml/Notifications/NotificationMenuItemFactory.qml:120
264+#: qml/Notifications/NotificationMenuItemFactory.qml:124
249265msgid "Enter SIM PIN"
250266msgstr ""
251267
252−#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
268+#: qml/Notifications/NotificationMenuItemFactory.qml:125
253269msgid "Sorry, incorrect PIN"
254270msgstr ""
255271
@@ -261,27 +277,31 @@ msgstr ""
261277msgid "Conference"
262278msgstr ""
263279
264−#: qml/Panel/Indicators/MenuItemFactory.qml:651
280+#: qml/Panel/Indicators/MenuItemFactory.qml:600
281+msgid "Nothing is playing"
282+msgstr ""
283+
284+#: qml/Panel/Indicators/MenuItemFactory.qml:748
265285msgid "In queue…"
266286msgstr ""
267287
268−#: qml/Panel/Indicators/MenuItemFactory.qml:655
288+#: qml/Panel/Indicators/MenuItemFactory.qml:752
269289msgid "Downloading"
270290msgstr ""
271291
272−#: qml/Panel/Indicators/MenuItemFactory.qml:657
292+#: qml/Panel/Indicators/MenuItemFactory.qml:754
273293msgid "Paused, tap to resume"
274294msgstr ""
275295
276−#: qml/Panel/Indicators/MenuItemFactory.qml:659
296+#: qml/Panel/Indicators/MenuItemFactory.qml:756
277297msgid "Canceled"
278298msgstr ""
279299
280−#: qml/Panel/Indicators/MenuItemFactory.qml:661
300+#: qml/Panel/Indicators/MenuItemFactory.qml:758
281301msgid "Finished"
282302msgstr ""
283303
284−#: qml/Panel/Indicators/MenuItemFactory.qml:663
304+#: qml/Panel/Indicators/MenuItemFactory.qml:760
285305msgid "Failed, tap to retry"
286306msgstr ""
287307
@@ -293,52 +313,63 @@ msgstr ""
293313msgid "Roaming"
294314msgstr ""
295315
296−#: qml/Shell.qml:266
297−msgid "Enter your passphrase"
316+#: qml/Shell.qml:340
317+msgid "Enter passphrase"
298318msgstr ""
299319
300−#: qml/Shell.qml:267
320+#: qml/Shell.qml:341
301321msgid "Sorry, incorrect passphrase"
302322msgstr ""
303323
304−#: qml/Shell.qml:282
305−msgid "Enter your passcode"
324+#: qml/Shell.qml:342
325+msgid "Please re-enter"
326+msgstr ""
327+
328+#: qml/Shell.qml:344
329+msgid "Enter passcode"
306330msgstr ""
307331
308−#: qml/Shell.qml:283
332+#: qml/Shell.qml:345
309333msgid "Sorry, incorrect passcode"
310334msgstr ""
311335
312−#: qml/Shell.qml:273
336+#: qml/Shell.qml:348
313337#, qt-format
314−msgid "Enter your %1"
338+msgid "Enter %1"
315339msgstr ""
316340
317−#: qml/Shell.qml:274
341+#: qml/Shell.qml:349
318342#, qt-format
319343msgid "Sorry, incorrect %1"
320344msgstr ""
321345
322−#: qml/Shell.qml:310
346+#: qml/Shell.qml:384
323347msgid "Sorry, incorrect passphrase."
324348msgstr ""
325349
326−#: qml/Shell.qml:311
350+#: qml/Shell.qml:385
327351msgid "Sorry, incorrect passcode."
328352msgstr ""
329353
330−#: qml/Shell.qml:312
354+#: qml/Shell.qml:386
331355msgid "This will be your last attempt."
332356msgstr ""
333357
334−#: qml/Shell.qml:314
358+#: qml/Shell.qml:388
335359msgid ""
336360"If passphrase is entered incorrectly, your phone will conduct a factory "
337361"reset and all personal data will be deleted."
338362msgstr ""
339363
340−#: qml/Shell.qml:315
364+#: qml/Shell.qml:389
341365msgid ""
342366"If passcode is entered incorrectly, your phone will conduct a factory reset "
343367"and all personal data will be deleted."
344368msgstr ""
369+
370+#, qt-format
371+#~ msgid "Hello %1"
372+#~ msgstr "سڵاو %1"
373+
374+#~ msgid "Hello"
375+#~ msgstr "سڵاو"
po/cs.po+96−65
@@ -7,29 +7,49 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-26 18:24+0200\n"
10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
1111"PO-Revision-Date: 2014-01-08 10:11+0000\n"
1212"Last-Translator: Tadeáš Pařík <tadeas.parik@gmail.com>\n"
1313"Language-Team: Czech <cs@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-28 06:30+0000\n"
18−"X-Generator: Launchpad (build 17174)\n"
17+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
18+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"
19+"X-Generator: Launchpad (build 17196)\n"
1920
20−#: plugins/LightDM/Greeter.cpp:129
21+#: plugins/LightDM/Greeter.cpp:130
2122msgid "Password: "
2223msgstr ""
2324
24−#: plugins/Unity/Launcher/launcheritem.cpp:43
25−#: plugins/Unity/Launcher/launcheritem.cpp:73
25+#: plugins/Unity/Launcher/launcheritem.cpp:45
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
2627msgid "Pin shortcut"
2728msgstr ""
2829
29−#: plugins/Unity/Launcher/launcheritem.cpp:73
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
3031msgid "Unpin shortcut"
3132msgstr ""
3233
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
3353#: qml/Components/Dialogs.qml:70
3454msgid "Log out"
3555msgstr ""
@@ -74,11 +94,15 @@ msgid ""
7494"to power off?"
7595msgstr ""
7696
77−#: qml/Components/Dialogs.qml:144
97+#: qml/Components/Dialogs.qml:147
7898msgid "Power off"
7999msgstr ""
80100
81−#: qml/Components/Dialogs.qml:162
101+#: qml/Components/Dialogs.qml:157
102+msgid "Restart"
103+msgstr ""
104+
105+#: qml/Components/Dialogs.qml:167
82106msgid "Cancel"
83107msgstr ""
84108
@@ -128,60 +152,44 @@ msgid ""
128152"phone<br><br>Tap on the screen to start"
129153msgstr ""
130154
131−#: qml/Components/Lockscreen.qml:167
132−msgid "Please wait"
133−msgstr ""
134−
135−#: qml/Components/Lockscreen.qml:172
136−msgid "Too many incorrect attempts"
137−msgstr ""
138−
139−#: qml/Components/Lockscreen.qml:206
155+#: qml/Components/Lockscreen.qml:218
140156msgid "Emergency Call"
141157msgstr "Tísňové volání"
142158
143−#: qml/Components/Lockscreen.qml:226
159+#: qml/Components/Lockscreen.qml:250
144160msgid "OK"
145161msgstr ""
146162
147−#: qml/Components/PassphraseLockscreen.qml:61
148−#, qt-format
149−msgid "Hello %1"
150−msgstr "Ahoj %1"
151−
152−#: qml/Components/PassphraseLockscreen.qml:61
153−msgid "Hello"
154−msgstr "Ahoj"
155−
156−#: qml/Dash/GenericScopeView.qml:361
163+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
157164msgid "See less"
158165msgstr ""
159166
160−#: qml/Dash/GenericScopeView.qml:361
167+#: qml/Dash/GenericScopeView.qml:411
161168msgid "See all"
162169msgstr ""
163170
164−#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
171+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
172+#: qml/Panel/SearchIndicator.qml:27
165173msgid "Search"
166174msgstr "Hledat"
167175
168−#: qml/Dash/PageHeader.qml:270
176+#: qml/Dash/PageHeader.qml:268
169177msgid "Settings"
170178msgstr ""
171179
172−#: qml/Dash/PageHeader.qml:279
180+#: qml/Dash/PageHeader.qml:275
173181msgid "Remove from Favorites"
174182msgstr ""
175183
176−#: qml/Dash/PageHeader.qml:279
184+#: qml/Dash/PageHeader.qml:275
177185msgid "Add to Favorites"
178186msgstr ""
179187
180−#: qml/Dash/Previews/PreviewActionCombo.qml:34
188+#: qml/Dash/Previews/PreviewActionCombo.qml:35
181189msgid "More..."
182190msgstr ""
183191
184−#: qml/Dash/Previews/PreviewActionCombo.qml:34
192+#: qml/Dash/Previews/PreviewActionCombo.qml:35
185193msgid "Less..."
186194msgstr ""
187195
@@ -197,15 +205,23 @@ msgstr "Přidat recenzi"
197205msgid "Send"
198206msgstr "Odeslat"
199207
200−#: qml/Dash/ScopesOverview.qml:201
201−msgid "Manage Dash"
208+#: qml/Dash/PullToRefreshScopeStyle.qml:55
209+msgid "Pull to refresh…"
210+msgstr ""
211+
212+#: qml/Dash/PullToRefreshScopeStyle.qml:60
213+msgid "Release to refresh…"
214+msgstr ""
215+
216+#: qml/Dash/ScopesOverview.qml:206
217+msgid "Manage Scopes"
202218msgstr ""
203219
204−#: qml/Dash/ScopesOverview.qml:408
220+#: qml/Dash/ScopesOverview.qml:428
205221msgid "Done"
206222msgstr ""
207223
208−#: qml/Dash/ScopesOverview.qml:434
224+#: qml/Dash/ScopesOverview.qml:454
209225msgid "Store"
210226msgstr ""
211227
@@ -218,10 +234,10 @@ msgid "All"
218234msgstr ""
219235
220236#: qml/Greeter/Greeter.qml:157
221−msgid "Swipe to unlock"
237+msgid "Unlock"
222238msgstr ""
223239
224−#: qml/Hud/HudParametrizedActionsPage.qml:132
240+#: qml/Hud/HudParametrizedActionsPage.qml:139
225241msgid "Confirm"
226242msgstr "Potvrdit"
227243
@@ -241,15 +257,15 @@ msgstr "Mluvte..."
241257msgid "Speaking..."
242258msgstr "Mluvte..."
243259
244−#: qml/Notifications/NotificationMenuItemFactory.qml:105
260+#: qml/Notifications/NotificationMenuItemFactory.qml:108
245261msgid "Show password"
246262msgstr "Zobrazit heslo"
247263
248−#: qml/Notifications/NotificationMenuItemFactory.qml:120
264+#: qml/Notifications/NotificationMenuItemFactory.qml:124
249265msgid "Enter SIM PIN"
250266msgstr ""
251267
252−#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
268+#: qml/Notifications/NotificationMenuItemFactory.qml:125
253269msgid "Sorry, incorrect PIN"
254270msgstr ""
255271
@@ -261,27 +277,31 @@ msgstr ""
261277msgid "Conference"
262278msgstr ""
263279
264−#: qml/Panel/Indicators/MenuItemFactory.qml:651
280+#: qml/Panel/Indicators/MenuItemFactory.qml:600
281+msgid "Nothing is playing"
282+msgstr ""
283+
284+#: qml/Panel/Indicators/MenuItemFactory.qml:748
265285msgid "In queue…"
266286msgstr ""
267287
268−#: qml/Panel/Indicators/MenuItemFactory.qml:655
288+#: qml/Panel/Indicators/MenuItemFactory.qml:752
269289msgid "Downloading"
270290msgstr ""
271291
272−#: qml/Panel/Indicators/MenuItemFactory.qml:657
292+#: qml/Panel/Indicators/MenuItemFactory.qml:754
273293msgid "Paused, tap to resume"
274294msgstr ""
275295
276−#: qml/Panel/Indicators/MenuItemFactory.qml:659
296+#: qml/Panel/Indicators/MenuItemFactory.qml:756
277297msgid "Canceled"
278298msgstr ""
279299
280−#: qml/Panel/Indicators/MenuItemFactory.qml:661
300+#: qml/Panel/Indicators/MenuItemFactory.qml:758
281301msgid "Finished"
282302msgstr ""
283303
284−#: qml/Panel/Indicators/MenuItemFactory.qml:663
304+#: qml/Panel/Indicators/MenuItemFactory.qml:760
285305msgid "Failed, tap to retry"
286306msgstr ""
287307
@@ -293,52 +313,63 @@ msgstr ""
293313msgid "Roaming"
294314msgstr ""
295315
296−#: qml/Shell.qml:266
297−msgid "Enter your passphrase"
316+#: qml/Shell.qml:340
317+msgid "Enter passphrase"
298318msgstr ""
299319
300−#: qml/Shell.qml:267
320+#: qml/Shell.qml:341
301321msgid "Sorry, incorrect passphrase"
302322msgstr ""
303323
304−#: qml/Shell.qml:282
305−msgid "Enter your passcode"
324+#: qml/Shell.qml:342
325+msgid "Please re-enter"
326+msgstr ""
327+
328+#: qml/Shell.qml:344
329+msgid "Enter passcode"
306330msgstr ""
307331
308−#: qml/Shell.qml:283
332+#: qml/Shell.qml:345
309333msgid "Sorry, incorrect passcode"
310334msgstr ""
311335
312−#: qml/Shell.qml:273
336+#: qml/Shell.qml:348
313337#, qt-format
314−msgid "Enter your %1"
338+msgid "Enter %1"
315339msgstr ""
316340
317−#: qml/Shell.qml:274
341+#: qml/Shell.qml:349
318342#, qt-format
319343msgid "Sorry, incorrect %1"
320344msgstr ""
321345
322−#: qml/Shell.qml:310
346+#: qml/Shell.qml:384
323347msgid "Sorry, incorrect passphrase."
324348msgstr ""
325349
326−#: qml/Shell.qml:311
350+#: qml/Shell.qml:385
327351msgid "Sorry, incorrect passcode."
328352msgstr ""
329353
330−#: qml/Shell.qml:312
354+#: qml/Shell.qml:386
331355msgid "This will be your last attempt."
332356msgstr ""
333357
334−#: qml/Shell.qml:314
358+#: qml/Shell.qml:388
335359msgid ""
336360"If passphrase is entered incorrectly, your phone will conduct a factory "
337361"reset and all personal data will be deleted."
338362msgstr ""
339363
340−#: qml/Shell.qml:315
364+#: qml/Shell.qml:389
341365msgid ""
342366"If passcode is entered incorrectly, your phone will conduct a factory reset "
343367"and all personal data will be deleted."
344368msgstr ""
369+
370+#~ msgid "Hello"
371+#~ msgstr "Ahoj"
372+
373+#, qt-format
374+#~ msgid "Hello %1"
375+#~ msgstr "Ahoj %1"
po/da.po+100−66
@@ -8,29 +8,49 @@ msgid ""
88msgstr ""
99"Project-Id-Version: unity8\n"
1010"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
11−"POT-Creation-Date: 2014-08-26 18:24+0200\n"
11+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
1212"PO-Revision-Date: 2014-07-30 12:37+0000\n"
1313"Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n"
1414"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
1515"MIME-Version: 1.0\n"
1616"Content-Type: text/plain; charset=UTF-8\n"
1717"Content-Transfer-Encoding: 8bit\n"
18−"X-Launchpad-Export-Date: 2014-08-28 06:30+0000\n"
19−"X-Generator: Launchpad (build 17174)\n"
18+"Plural-Forms: nplurals=2; plural=n != 1;\n"
19+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"
20+"X-Generator: Launchpad (build 17196)\n"
2021
21−#: plugins/LightDM/Greeter.cpp:129
22+#: plugins/LightDM/Greeter.cpp:130
2223msgid "Password: "
2324msgstr ""
2425
25−#: plugins/Unity/Launcher/launcheritem.cpp:43
26−#: plugins/Unity/Launcher/launcheritem.cpp:73
26+#: plugins/Unity/Launcher/launcheritem.cpp:45
27+#: plugins/Unity/Launcher/launcheritem.cpp:91
2728msgid "Pin shortcut"
2829msgstr "Fastgør genvej"
2930
30−#: plugins/Unity/Launcher/launcheritem.cpp:73
31+#: plugins/Unity/Launcher/launcheritem.cpp:91
3132msgid "Unpin shortcut"
3233msgstr "Gør genvej flytbar"
3334
35+#: qml/Components/DelayedLockscreen.qml:47
36+msgid "Device Locked"
37+msgstr ""
38+
39+#: qml/Components/DelayedLockscreen.qml:62
40+msgid "You have been locked out due to too many failed passphrase attempts."
41+msgstr ""
42+
43+#: qml/Components/DelayedLockscreen.qml:63
44+msgid "You have been locked out due to too many failed passcode attempts."
45+msgstr ""
46+
47+#: qml/Components/DelayedLockscreen.qml:72
48+#, qt-format
49+msgid "Please wait %1 minute and then try again…"
50+msgid_plural "Please wait %1 minutes and then try again…"
51+msgstr[0] ""
52+msgstr[1] ""
53+
3454#: qml/Components/Dialogs.qml:70
3555msgid "Log out"
3656msgstr ""
@@ -75,11 +95,15 @@ msgid ""
7595"to power off?"
7696msgstr ""
7797
78−#: qml/Components/Dialogs.qml:144
98+#: qml/Components/Dialogs.qml:147
7999msgid "Power off"
80100msgstr ""
81101
82−#: qml/Components/Dialogs.qml:162
102+#: qml/Components/Dialogs.qml:157
103+msgid "Restart"
104+msgstr ""
105+
106+#: qml/Components/Dialogs.qml:167
83107msgid "Cancel"
84108msgstr ""
85109
@@ -131,60 +155,44 @@ msgstr ""
131155"Du mestrer nu kantbevægelserne og kan begynde at bruge telefonen<br><br>Tryk "
132156"på skærmen for at starte"
133157
134−#: qml/Components/Lockscreen.qml:167
135−msgid "Please wait"
136−msgstr ""
137−
138−#: qml/Components/Lockscreen.qml:172
139−msgid "Too many incorrect attempts"
140−msgstr ""
141−
142−#: qml/Components/Lockscreen.qml:206
158+#: qml/Components/Lockscreen.qml:218
143159msgid "Emergency Call"
144160msgstr "Nødopkald"
145161
146−#: qml/Components/Lockscreen.qml:226
162+#: qml/Components/Lockscreen.qml:250
147163msgid "OK"
148164msgstr "O.k."
149165
150−#: qml/Components/PassphraseLockscreen.qml:61
151−#, qt-format
152−msgid "Hello %1"
153−msgstr "Hej %1"
154−
155−#: qml/Components/PassphraseLockscreen.qml:61
156−msgid "Hello"
157−msgstr "Hej"
158−
159−#: qml/Dash/GenericScopeView.qml:361
166+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
160167msgid "See less"
161168msgstr "Vis mindre"
162169
163−#: qml/Dash/GenericScopeView.qml:361
170+#: qml/Dash/GenericScopeView.qml:411
164171msgid "See all"
165172msgstr "Se alle"
166173
167−#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
174+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
175+#: qml/Panel/SearchIndicator.qml:27
168176msgid "Search"
169177msgstr "Søg"
170178
171−#: qml/Dash/PageHeader.qml:270
179+#: qml/Dash/PageHeader.qml:268
172180msgid "Settings"
173181msgstr ""
174182
175−#: qml/Dash/PageHeader.qml:279
183+#: qml/Dash/PageHeader.qml:275
176184msgid "Remove from Favorites"
177185msgstr ""
178186
179−#: qml/Dash/PageHeader.qml:279
187+#: qml/Dash/PageHeader.qml:275
180188msgid "Add to Favorites"
181189msgstr ""
182190
183−#: qml/Dash/Previews/PreviewActionCombo.qml:34
191+#: qml/Dash/Previews/PreviewActionCombo.qml:35
184192msgid "More..."
185193msgstr "Mere..."
186194
187−#: qml/Dash/Previews/PreviewActionCombo.qml:34
195+#: qml/Dash/Previews/PreviewActionCombo.qml:35
188196msgid "Less..."
189197msgstr "Mindre..."
190198
@@ -200,15 +208,23 @@ msgstr "Tilføj en forhåndsvisning"
200208msgid "Send"
201209msgstr "Send"
202210
203−#: qml/Dash/ScopesOverview.qml:201
204−msgid "Manage Dash"
211+#: qml/Dash/PullToRefreshScopeStyle.qml:55
212+msgid "Pull to refresh…"
213+msgstr ""
214+
215+#: qml/Dash/PullToRefreshScopeStyle.qml:60
216+msgid "Release to refresh…"
205217msgstr ""
206218
207−#: qml/Dash/ScopesOverview.qml:408
219+#: qml/Dash/ScopesOverview.qml:206
220+msgid "Manage Scopes"
221+msgstr ""
222+
223+#: qml/Dash/ScopesOverview.qml:428
208224msgid "Done"
209225msgstr ""
210226
211−#: qml/Dash/ScopesOverview.qml:434
227+#: qml/Dash/ScopesOverview.qml:454
212228msgid "Store"
213229msgstr ""
214230
@@ -221,10 +237,10 @@ msgid "All"
221237msgstr ""
222238
223239#: qml/Greeter/Greeter.qml:157
224−msgid "Swipe to unlock"
225−msgstr "Stryg for at låse op"
240+msgid "Unlock"
241+msgstr ""
226242
227−#: qml/Hud/HudParametrizedActionsPage.qml:132
243+#: qml/Hud/HudParametrizedActionsPage.qml:139
228244msgid "Confirm"
229245msgstr "Bekræft"
230246
@@ -244,15 +260,15 @@ msgstr "Tal nu..."
244260msgid "Speaking..."
245261msgstr "Taler..."
246262
247−#: qml/Notifications/NotificationMenuItemFactory.qml:105
263+#: qml/Notifications/NotificationMenuItemFactory.qml:108
248264msgid "Show password"
249265msgstr "Vis adgangskode"
250266
251−#: qml/Notifications/NotificationMenuItemFactory.qml:120
267+#: qml/Notifications/NotificationMenuItemFactory.qml:124
252268msgid "Enter SIM PIN"
253269msgstr ""
254270
255−#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
271+#: qml/Notifications/NotificationMenuItemFactory.qml:125
256272msgid "Sorry, incorrect PIN"
257273msgstr ""
258274
@@ -264,27 +280,31 @@ msgstr "Tryk for at besvare opkaldet..."
264280msgid "Conference"
265281msgstr "Konference"
266282
267−#: qml/Panel/Indicators/MenuItemFactory.qml:651
283+#: qml/Panel/Indicators/MenuItemFactory.qml:600
284+msgid "Nothing is playing"
285+msgstr ""
286+
287+#: qml/Panel/Indicators/MenuItemFactory.qml:748
268288msgid "In queue…"
269289msgstr "I kø…"
270290
271−#: qml/Panel/Indicators/MenuItemFactory.qml:655
291+#: qml/Panel/Indicators/MenuItemFactory.qml:752
272292msgid "Downloading"
273293msgstr "Henter"
274294
275−#: qml/Panel/Indicators/MenuItemFactory.qml:657
295+#: qml/Panel/Indicators/MenuItemFactory.qml:754
276296msgid "Paused, tap to resume"
277297msgstr "På pause; tryk for at fortsætte"
278298
279−#: qml/Panel/Indicators/MenuItemFactory.qml:659
299+#: qml/Panel/Indicators/MenuItemFactory.qml:756
280300msgid "Canceled"
281301msgstr "Annulleret"
282302
283−#: qml/Panel/Indicators/MenuItemFactory.qml:661
303+#: qml/Panel/Indicators/MenuItemFactory.qml:758
284304msgid "Finished"
285305msgstr "Færdig"
286306
287−#: qml/Panel/Indicators/MenuItemFactory.qml:663
307+#: qml/Panel/Indicators/MenuItemFactory.qml:760
288308msgid "Failed, tap to retry"
289309msgstr "Mislykkedes; tryk for at prøve igen"
290310
@@ -296,52 +316,66 @@ msgstr ""
296316msgid "Roaming"
297317msgstr ""
298318
299−#: qml/Shell.qml:266
300−msgid "Enter your passphrase"
319+#: qml/Shell.qml:340
320+msgid "Enter passphrase"
301321msgstr ""
302322
303−#: qml/Shell.qml:267
323+#: qml/Shell.qml:341
304324msgid "Sorry, incorrect passphrase"
305325msgstr ""
306326
307−#: qml/Shell.qml:282
308−msgid "Enter your passcode"
327+#: qml/Shell.qml:342
328+msgid "Please re-enter"
329+msgstr ""
330+
331+#: qml/Shell.qml:344
332+msgid "Enter passcode"
309333msgstr ""
310334
311−#: qml/Shell.qml:283
335+#: qml/Shell.qml:345
312336msgid "Sorry, incorrect passcode"
313337msgstr ""
314338
315−#: qml/Shell.qml:273
339+#: qml/Shell.qml:348
316340#, qt-format
317−msgid "Enter your %1"
341+msgid "Enter %1"
318342msgstr ""
319343
320−#: qml/Shell.qml:274
344+#: qml/Shell.qml:349
321345#, qt-format
322346msgid "Sorry, incorrect %1"
323347msgstr ""
324348
325−#: qml/Shell.qml:310
349+#: qml/Shell.qml:384
326350msgid "Sorry, incorrect passphrase."
327351msgstr ""
328352
329−#: qml/Shell.qml:311
353+#: qml/Shell.qml:385
330354msgid "Sorry, incorrect passcode."
331355msgstr ""
332356
333−#: qml/Shell.qml:312
357+#: qml/Shell.qml:386
334358msgid "This will be your last attempt."
335359msgstr ""
336360
337−#: qml/Shell.qml:314
361+#: qml/Shell.qml:388
338362msgid ""
339363"If passphrase is entered incorrectly, your phone will conduct a factory "
340364"reset and all personal data will be deleted."
341365msgstr ""
342366
343−#: qml/Shell.qml:315
367+#: qml/Shell.qml:389
344368msgid ""
345369"If passcode is entered incorrectly, your phone will conduct a factory reset "
346370"and all personal data will be deleted."
347371msgstr ""
372+
373+#, qt-format
374+#~ msgid "Hello %1"
375+#~ msgstr "Hej %1"
376+
377+#~ msgid "Hello"
378+#~ msgstr "Hej"
379+
380+#~ msgid "Swipe to unlock"
381+#~ msgstr "Stryg for at låse op"
po/de.po+134−91
@@ -7,78 +7,104 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-26 18:24+0200\n"
11−"PO-Revision-Date: 2014-08-26 10:17+0000\n"
12−"Last-Translator: Martin Pitt <martin.pitt@ubuntu.com>\n"
10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
11+"PO-Revision-Date: 2014-09-29 06:33+0000\n"
12+"Last-Translator: Niklas Wenzel <nikwen.developer@gmail.com>\n"
1313"Language-Team: German <de@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-28 06:30+0000\n"
18−"X-Generator: Launchpad (build 17174)\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
18+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"
19+"X-Generator: Launchpad (build 17196)\n"
1920
20−#: plugins/LightDM/Greeter.cpp:129
21+#: plugins/LightDM/Greeter.cpp:130
2122msgid "Password: "
2223msgstr "Passwort: "
2324
24−#: plugins/Unity/Launcher/launcheritem.cpp:43
25−#: plugins/Unity/Launcher/launcheritem.cpp:73
25+#: plugins/Unity/Launcher/launcheritem.cpp:45
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
2627msgid "Pin shortcut"
2728msgstr "Verknüpfung anheften"
2829
29−#: plugins/Unity/Launcher/launcheritem.cpp:73
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
3031msgid "Unpin shortcut"
3132msgstr "Verknüpfung entfernen"
3233
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
3353#: qml/Components/Dialogs.qml:70
3454msgid "Log out"
35−msgstr ""
55+msgstr "Abmelden"
3656
3757#: qml/Components/Dialogs.qml:71
3858msgid "Are you sure you want to log out?"
39−msgstr ""
59+msgstr "Sind Sie sicher, dass Sie sich abmelden wollen?"
4060
4161#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97
4262#: qml/Components/Dialogs.qml:122
4363msgid "No"
44−msgstr ""
64+msgstr "Nein"
4565
4666#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104
4767#: qml/Components/Dialogs.qml:129
4868msgid "Yes"
49−msgstr ""
69+msgstr "Ja"
5070
5171#: qml/Components/Dialogs.qml:94
5272msgid "Shut down"
53−msgstr ""
73+msgstr "Herunterfahren"
5474
5575#: qml/Components/Dialogs.qml:95
5676msgid "Are you sure you want to shut down?"
57−msgstr ""
77+msgstr "Sind Sie sicher, dass Sie herunterfahren wollen?"
5878
5979#: qml/Components/Dialogs.qml:119
6080msgid "Reboot"
61−msgstr ""
81+msgstr "Neustart"
6282
6383#: qml/Components/Dialogs.qml:120
6484msgid "Are you sure you want to reboot?"
65−msgstr ""
85+msgstr "Sind Sie sicher, dass Sie neu starten wollen?"
6686
6787#: qml/Components/Dialogs.qml:144
6888msgid "Power"
69−msgstr ""
89+msgstr "Energie"
7090
7191#: qml/Components/Dialogs.qml:145
7292msgid ""
7393"Are you sure you would like\n"
7494"to power off?"
7595msgstr ""
96+"Sind Sie sicher, dass Sie das\n"
97+"Gerät ausschalten wollen?"
7698
77−#: qml/Components/Dialogs.qml:144
99+#: qml/Components/Dialogs.qml:147
78100msgid "Power off"
79101msgstr "Ausschalten"
80102
81−#: qml/Components/Dialogs.qml:162
103+#: qml/Components/Dialogs.qml:157
104+msgid "Restart"
105+msgstr "Neustarten"
106+
107+#: qml/Components/Dialogs.qml:167
82108msgid "Cancel"
83109msgstr "Abbrechen"
84110
@@ -133,60 +159,44 @@ msgstr ""
133159"Sie haben nun die Kantengesten erfolgreich erlernt und können das Telefon "
134160"nun nutzen<br><br>Zum Starten auf den Bildschirm tippen"
135161
136−#: qml/Components/Lockscreen.qml:167
137−msgid "Please wait"
138−msgstr "Bitte warten"
139−
140−#: qml/Components/Lockscreen.qml:172
141−msgid "Too many incorrect attempts"
142−msgstr "Zu viele falsche Versuche"
143−
144−#: qml/Components/Lockscreen.qml:206
162+#: qml/Components/Lockscreen.qml:218
145163msgid "Emergency Call"
146164msgstr "Notruf"
147165
148−#: qml/Components/Lockscreen.qml:226
166+#: qml/Components/Lockscreen.qml:250
149167msgid "OK"
150168msgstr "OK"
151169
152−#: qml/Components/PassphraseLockscreen.qml:61
153−#, qt-format
154−msgid "Hello %1"
155−msgstr "Hallo %1"
156−
157−#: qml/Components/PassphraseLockscreen.qml:61
158−msgid "Hello"
159−msgstr "Hallo"
160−
161−#: qml/Dash/GenericScopeView.qml:361
170+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
162171msgid "See less"
163172msgstr "Weniger ansehen"
164173
165−#: qml/Dash/GenericScopeView.qml:361
174+#: qml/Dash/GenericScopeView.qml:411
166175msgid "See all"
167176msgstr "Alle anzeigen"
168177
169−#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
178+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
179+#: qml/Panel/SearchIndicator.qml:27
170180msgid "Search"
171181msgstr "Suchen"
172182
173−#: qml/Dash/PageHeader.qml:270
183+#: qml/Dash/PageHeader.qml:268
174184msgid "Settings"
175−msgstr ""
185+msgstr "Einstellungen"
176186
177−#: qml/Dash/PageHeader.qml:279
187+#: qml/Dash/PageHeader.qml:275
178188msgid "Remove from Favorites"
179−msgstr ""
189+msgstr "Aus den Favoriten entfernen"
180190
181−#: qml/Dash/PageHeader.qml:279
191+#: qml/Dash/PageHeader.qml:275
182192msgid "Add to Favorites"
183−msgstr ""
193+msgstr "Zu Favoriten hinzufügen"
184194
185−#: qml/Dash/Previews/PreviewActionCombo.qml:34
195+#: qml/Dash/Previews/PreviewActionCombo.qml:35
186196msgid "More..."
187197msgstr "Mehr …"
188198
189−#: qml/Dash/Previews/PreviewActionCombo.qml:34
199+#: qml/Dash/Previews/PreviewActionCombo.qml:35
190200msgid "Less..."
191201msgstr "Weniger …"
192202
@@ -202,15 +212,23 @@ msgstr "Bewertung hinzufügen"
202212msgid "Send"
203213msgstr "Senden"
204214
205−#: qml/Dash/ScopesOverview.qml:201
206−msgid "Manage Dash"
207−msgstr "Dash verwalten"
215+#: qml/Dash/PullToRefreshScopeStyle.qml:55
216+msgid "Pull to refresh…"
217+msgstr ""
208218
209−#: qml/Dash/ScopesOverview.qml:408
219+#: qml/Dash/PullToRefreshScopeStyle.qml:60
220+msgid "Release to refresh…"
221+msgstr ""
222+
223+#: qml/Dash/ScopesOverview.qml:206
224+msgid "Manage Scopes"
225+msgstr "Filter verwalten"
226+
227+#: qml/Dash/ScopesOverview.qml:428
210228msgid "Done"
211229msgstr "Erledigt"
212230
213−#: qml/Dash/ScopesOverview.qml:434
231+#: qml/Dash/ScopesOverview.qml:454
214232msgid "Store"
215233msgstr "Store"
216234
@@ -223,10 +241,10 @@ msgid "All"
223241msgstr "Alle"
224242
225243#: qml/Greeter/Greeter.qml:157
226−msgid "Swipe to unlock"
227−msgstr "Wischen zum Entsperren"
244+msgid "Unlock"
245+msgstr ""
228246
229−#: qml/Hud/HudParametrizedActionsPage.qml:132
247+#: qml/Hud/HudParametrizedActionsPage.qml:139
230248msgid "Confirm"
231249msgstr "Bestätigen"
232250
@@ -246,15 +264,15 @@ msgstr "Sprechen Sie jetzt …"
246264msgid "Speaking..."
247265msgstr "Sprechen Sie …"
248266
249−#: qml/Notifications/NotificationMenuItemFactory.qml:105
267+#: qml/Notifications/NotificationMenuItemFactory.qml:108
250268msgid "Show password"
251269msgstr "Passwort anzeigen"
252270
253−#: qml/Notifications/NotificationMenuItemFactory.qml:120
271+#: qml/Notifications/NotificationMenuItemFactory.qml:124
254272msgid "Enter SIM PIN"
255273msgstr "Geben Sie die SIM-PIN ein"
256274
257−#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
275+#: qml/Notifications/NotificationMenuItemFactory.qml:125
258276msgid "Sorry, incorrect PIN"
259277msgstr "Die PIN ist nicht korrekt"
260278
@@ -266,77 +284,85 @@ msgstr "Tippen um zum Anruf zurückzugehen"
266284msgid "Conference"
267285msgstr "Konferenz"
268286
269−#: qml/Panel/Indicators/MenuItemFactory.qml:651
287+#: qml/Panel/Indicators/MenuItemFactory.qml:600
288+msgid "Nothing is playing"
289+msgstr "Nichts wird abgespielt"
290+
291+#: qml/Panel/Indicators/MenuItemFactory.qml:748
270292msgid "In queue…"
271293msgstr "In Warteschlange …"
272294
273−#: qml/Panel/Indicators/MenuItemFactory.qml:655
295+#: qml/Panel/Indicators/MenuItemFactory.qml:752
274296msgid "Downloading"
275297msgstr "Wird heruntergeladen"
276298
277−#: qml/Panel/Indicators/MenuItemFactory.qml:657
299+#: qml/Panel/Indicators/MenuItemFactory.qml:754
278300msgid "Paused, tap to resume"
279301msgstr "Pausiert, tippen Sie zum fortsetzen"
280302
281−#: qml/Panel/Indicators/MenuItemFactory.qml:659
303+#: qml/Panel/Indicators/MenuItemFactory.qml:756
282304msgid "Canceled"
283305msgstr "Abgebrochen"
284306
285−#: qml/Panel/Indicators/MenuItemFactory.qml:661
307+#: qml/Panel/Indicators/MenuItemFactory.qml:758
286308msgid "Finished"
287309msgstr "Erledigt"
288310
289−#: qml/Panel/Indicators/MenuItemFactory.qml:663
311+#: qml/Panel/Indicators/MenuItemFactory.qml:760
290312msgid "Failed, tap to retry"
291313msgstr "Fehlgeschlagen, tippen Sie zum Wiederholen"
292314
293315#: qml/Panel/Indicators/ModemInfoItem.qml:105
294316msgid "Unlock SIM"
295−msgstr "SIM-Karte entsprerren"
317+msgstr "SIM-Karte entsperren"
296318
297319#: qml/Panel/Indicators/RoamingIndication.qml:27
298320msgid "Roaming"
299321msgstr "Roaming"
300322
301−#: qml/Shell.qml:266
302−msgid "Enter your passphrase"
303−msgstr "Geben Sie Ihr Passwort ein"
323+#: qml/Shell.qml:340
324+msgid "Enter passphrase"
325+msgstr ""
304326
305−#: qml/Shell.qml:267
327+#: qml/Shell.qml:341
306328msgid "Sorry, incorrect passphrase"
307329msgstr "Das Passwort ist nicht korrekt"
308330
309−#: qml/Shell.qml:282
310−msgid "Enter your passcode"
331+#: qml/Shell.qml:342
332+msgid "Please re-enter"
311333msgstr ""
312334
313−#: qml/Shell.qml:283
314−msgid "Sorry, incorrect passcode"
335+#: qml/Shell.qml:344
336+msgid "Enter passcode"
315337msgstr ""
316338
317−#: qml/Shell.qml:273
339+#: qml/Shell.qml:345
340+msgid "Sorry, incorrect passcode"
341+msgstr "Falsches Passwort"
342+
343+#: qml/Shell.qml:348
318344#, qt-format
319−msgid "Enter your %1"
320−msgstr "%1 eingeben"
345+msgid "Enter %1"
346+msgstr ""
321347
322−#: qml/Shell.qml:274
348+#: qml/Shell.qml:349
323349#, qt-format
324350msgid "Sorry, incorrect %1"
325351msgstr "%1 falsch"
326352
327−#: qml/Shell.qml:310
353+#: qml/Shell.qml:384
328354msgid "Sorry, incorrect passphrase."
329355msgstr "Falsches Passwort."
330356
331−#: qml/Shell.qml:311
357+#: qml/Shell.qml:385
332358msgid "Sorry, incorrect passcode."
333359msgstr "Falsche PIN"
334360
335−#: qml/Shell.qml:312
361+#: qml/Shell.qml:386
336362msgid "This will be your last attempt."
337363msgstr "Dies ist Ihr letzter Versuch."
338364
339−#: qml/Shell.qml:314
365+#: qml/Shell.qml:388
340366msgid ""
341367"If passphrase is entered incorrectly, your phone will conduct a factory "
342368"reset and all personal data will be deleted."
@@ -344,7 +370,7 @@ msgstr ""
344370"Wird das Passwort falsch eingegeben, wird das Telefon auf den Werkszustand "
345371"zurückgesetzt und alle Daten werden gelöscht."
346372
347−#: qml/Shell.qml:315
373+#: qml/Shell.qml:389
348374msgid ""
349375"If passcode is entered incorrectly, your phone will conduct a factory reset "
350376"and all personal data will be deleted."
@@ -352,11 +378,28 @@ msgstr ""
352378"Wird die PIN falsch eingegeben, wird das Telefon auf den Werkszustand "
353379"zurückgesetzt und alle Daten werden gelöscht."
354380
355−#~ msgid "Restart"
356−#~ msgstr "Neustart"
381+#, qt-format
382+#~ msgid "Hello %1"
383+#~ msgstr "Hallo %1"
384+
385+#~ msgid "Hello"
386+#~ msgstr "Hallo"
387+
388+#~ msgid "Swipe to unlock"
389+#~ msgstr "Wischen zum Entsperren"
390+
391+#~ msgid "Please wait"
392+#~ msgstr "Bitte warten"
393+
394+#~ msgid "Too many incorrect attempts"
395+#~ msgstr "Zu viele falsche Versuche"
396+
397+#, qt-format
398+#~ msgid "Enter your %1"
399+#~ msgstr "%1 eingeben"
357400
358−#~ msgid "Are you sure you would like to turn power off?"
359−#~ msgstr "Sind Sie sicher dass das Telefon ausgeschaltet werden soll?"
401+#~ msgid "Enter your passphrase"
402+#~ msgstr "Geben Sie Ihr Passwort ein"
360403
361−#~ msgid "Enter your PIN"
362−#~ msgstr "Geben Sie Ihre PIN ein"
404+#~ msgid "Enter your passcode"
405+#~ msgstr "Passwort eingeben"
po/el.po+110−69
@@ -7,29 +7,49 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-26 18:24+0200\n"
10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
1111"PO-Revision-Date: 2014-08-21 12:06+0000\n"
1212"Last-Translator: Chris Taklis (aka Kailor) <ctaklis@gmail.com>\n"
1313"Language-Team: Greek <el@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-28 06:30+0000\n"
18−"X-Generator: Launchpad (build 17174)\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
18+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"
19+"X-Generator: Launchpad (build 17196)\n"
1920
20−#: plugins/LightDM/Greeter.cpp:129
21+#: plugins/LightDM/Greeter.cpp:130
2122msgid "Password: "
2223msgstr "Κωδικός πρόσβασης: "
2324
24−#: plugins/Unity/Launcher/launcheritem.cpp:43
25−#: plugins/Unity/Launcher/launcheritem.cpp:73
25+#: plugins/Unity/Launcher/launcheritem.cpp:45
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
2627msgid "Pin shortcut"
2728msgstr "Καρφίτσωμα συντόμευσης"
2829
29−#: plugins/Unity/Launcher/launcheritem.cpp:73
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
3031msgid "Unpin shortcut"
3132msgstr "Ξεκαρφίτσωμα συντόμευσης"
3233
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
3353#: qml/Components/Dialogs.qml:70
3454msgid "Log out"
3555msgstr ""
@@ -74,11 +94,15 @@ msgid ""
7494"to power off?"
7595msgstr ""
7696
77−#: qml/Components/Dialogs.qml:144
97+#: qml/Components/Dialogs.qml:147
7898msgid "Power off"
7999msgstr "Τερματισμός"
80100
81−#: qml/Components/Dialogs.qml:162
101+#: qml/Components/Dialogs.qml:157
102+msgid "Restart"
103+msgstr ""
104+
105+#: qml/Components/Dialogs.qml:167
82106msgid "Cancel"
83107msgstr "Ακύρωση"
84108
@@ -132,60 +156,44 @@ msgstr ""
132156"Πλέον γνωρίζετε τις χειρονομίες από τα άκρα και μπορείτε να ξεκινήσετε να "
133157"χρησιμοποιείτε το τηλέφωνο<br><br>Αγγίξτε την οθόνη για να ξεκινήσετε"
134158
135−#: qml/Components/Lockscreen.qml:167
136−msgid "Please wait"
137−msgstr "Παρακαλώ περιμένετε"
138−
139−#: qml/Components/Lockscreen.qml:172
140−msgid "Too many incorrect attempts"
141−msgstr "Πολλές άκυρες προσπάθειες"
142−
143−#: qml/Components/Lockscreen.qml:206
159+#: qml/Components/Lockscreen.qml:218
144160msgid "Emergency Call"
145161msgstr "Κλήση έκτακτης ανάγκης"
146162
147−#: qml/Components/Lockscreen.qml:226
163+#: qml/Components/Lockscreen.qml:250
148164msgid "OK"
149165msgstr "OK"
150166
151−#: qml/Components/PassphraseLockscreen.qml:61
152−#, qt-format
153−msgid "Hello %1"
154−msgstr "Γεια σας %1"
155−
156−#: qml/Components/PassphraseLockscreen.qml:61
157−msgid "Hello"
158−msgstr "Γεια σας"
159−
160−#: qml/Dash/GenericScopeView.qml:361
167+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
161168msgid "See less"
162169msgstr "Λιγότερα"
163170
164−#: qml/Dash/GenericScopeView.qml:361
171+#: qml/Dash/GenericScopeView.qml:411
165172msgid "See all"
166173msgstr "Εμφάνιση όλων"
167174
168−#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
175+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
176+#: qml/Panel/SearchIndicator.qml:27
169177msgid "Search"
170178msgstr "Αναζήτηση"
171179
172−#: qml/Dash/PageHeader.qml:270
180+#: qml/Dash/PageHeader.qml:268
173181msgid "Settings"
174182msgstr ""
175183
176−#: qml/Dash/PageHeader.qml:279
184+#: qml/Dash/PageHeader.qml:275
177185msgid "Remove from Favorites"
178186msgstr ""
179187
180−#: qml/Dash/PageHeader.qml:279
188+#: qml/Dash/PageHeader.qml:275
181189msgid "Add to Favorites"
182190msgstr ""
183191
184−#: qml/Dash/Previews/PreviewActionCombo.qml:34
192+#: qml/Dash/Previews/PreviewActionCombo.qml:35
185193msgid "More..."
186194msgstr "Περισσότερα..."
187195
188−#: qml/Dash/Previews/PreviewActionCombo.qml:34
196+#: qml/Dash/Previews/PreviewActionCombo.qml:35
189197msgid "Less..."
190198msgstr "Λιγότερα..."
191199
@@ -201,15 +209,23 @@ msgstr "Προσθέστε την αξιολόγησή σας"
201209msgid "Send"
202210msgstr "Αποστολή"
203211
204−#: qml/Dash/ScopesOverview.qml:201
205−msgid "Manage Dash"
212+#: qml/Dash/PullToRefreshScopeStyle.qml:55
213+msgid "Pull to refresh…"
206214msgstr ""
207215
208−#: qml/Dash/ScopesOverview.qml:408
216+#: qml/Dash/PullToRefreshScopeStyle.qml:60
217+msgid "Release to refresh…"
218+msgstr ""
219+
220+#: qml/Dash/ScopesOverview.qml:206
221+msgid "Manage Scopes"
222+msgstr ""
223+
224+#: qml/Dash/ScopesOverview.qml:428
209225msgid "Done"
210226msgstr "Ολοκληρώθηκε"
211227
212−#: qml/Dash/ScopesOverview.qml:434
228+#: qml/Dash/ScopesOverview.qml:454
213229msgid "Store"
214230msgstr "Κατάστημα"
215231
@@ -222,10 +238,10 @@ msgid "All"
222238msgstr "Όλα"
223239
224240#: qml/Greeter/Greeter.qml:157
225−msgid "Swipe to unlock"
226−msgstr "Σύρετε για να ξεκλειδώσετε"
241+msgid "Unlock"
242+msgstr ""
227243
228−#: qml/Hud/HudParametrizedActionsPage.qml:132
244+#: qml/Hud/HudParametrizedActionsPage.qml:139
229245msgid "Confirm"
230246msgstr "Επιβεβαίωση"
231247
@@ -245,15 +261,15 @@ msgstr "Μιλήστε τώρα..."
245261msgid "Speaking..."
246262msgstr "Ομιλία..."
247263
248−#: qml/Notifications/NotificationMenuItemFactory.qml:105
264+#: qml/Notifications/NotificationMenuItemFactory.qml:108
249265msgid "Show password"
250266msgstr "Εμφάνιση κωδικού"
251267
252−#: qml/Notifications/NotificationMenuItemFactory.qml:120
268+#: qml/Notifications/NotificationMenuItemFactory.qml:124
253269msgid "Enter SIM PIN"
254270msgstr ""
255271
256−#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
272+#: qml/Notifications/NotificationMenuItemFactory.qml:125
257273msgid "Sorry, incorrect PIN"
258274msgstr ""
259275
@@ -265,27 +281,31 @@ msgstr "Πατήστε για να γυρίσετε στην κλήση..."
265281msgid "Conference"
266282msgstr "Συνδιάσκεψη"
267283
268−#: qml/Panel/Indicators/MenuItemFactory.qml:651
284+#: qml/Panel/Indicators/MenuItemFactory.qml:600
285+msgid "Nothing is playing"
286+msgstr ""
287+
288+#: qml/Panel/Indicators/MenuItemFactory.qml:748
269289msgid "In queue…"
270290msgstr "Στην ουρά..."
271291
272−#: qml/Panel/Indicators/MenuItemFactory.qml:655
292+#: qml/Panel/Indicators/MenuItemFactory.qml:752
273293msgid "Downloading"
274294msgstr "Λήψη σε εξέλιξη"
275295
276−#: qml/Panel/Indicators/MenuItemFactory.qml:657
296+#: qml/Panel/Indicators/MenuItemFactory.qml:754
277297msgid "Paused, tap to resume"
278298msgstr "Σταματημένο, αγγίξτε για συνέχιση"
279299
280−#: qml/Panel/Indicators/MenuItemFactory.qml:659
300+#: qml/Panel/Indicators/MenuItemFactory.qml:756
281301msgid "Canceled"
282302msgstr "Ακυρώθηκε"
283303
284−#: qml/Panel/Indicators/MenuItemFactory.qml:661
304+#: qml/Panel/Indicators/MenuItemFactory.qml:758
285305msgid "Finished"
286306msgstr "Ολοκληρώθηκε"
287307
288−#: qml/Panel/Indicators/MenuItemFactory.qml:663
308+#: qml/Panel/Indicators/MenuItemFactory.qml:760
289309msgid "Failed, tap to retry"
290310msgstr "Αποτυχία, πατήστε για να ξαναπροσπαθήσετε"
291311
@@ -297,55 +317,76 @@ msgstr "Ξεκλείδωμα SIM"
297317msgid "Roaming"
298318msgstr "Περιαγωγή"
299319
300−#: qml/Shell.qml:266
301−msgid "Enter your passphrase"
320+#: qml/Shell.qml:340
321+msgid "Enter passphrase"
302322msgstr ""
303323
304−#: qml/Shell.qml:267
324+#: qml/Shell.qml:341
305325msgid "Sorry, incorrect passphrase"
306326msgstr ""
307327
308−#: qml/Shell.qml:282
309−msgid "Enter your passcode"
328+#: qml/Shell.qml:342
329+msgid "Please re-enter"
330+msgstr ""
331+
332+#: qml/Shell.qml:344
333+msgid "Enter passcode"
310334msgstr ""
311335
312−#: qml/Shell.qml:283
336+#: qml/Shell.qml:345
313337msgid "Sorry, incorrect passcode"
314338msgstr ""
315339
316−#: qml/Shell.qml:273
340+#: qml/Shell.qml:348
317341#, qt-format
318−msgid "Enter your %1"
319−msgstr "Εισάγετε το %1"
342+msgid "Enter %1"
343+msgstr ""
320344
321−#: qml/Shell.qml:274
345+#: qml/Shell.qml:349
322346#, qt-format
323347msgid "Sorry, incorrect %1"
324348msgstr ""
325349
326−#: qml/Shell.qml:310
350+#: qml/Shell.qml:384
327351msgid "Sorry, incorrect passphrase."
328352msgstr ""
329353
330−#: qml/Shell.qml:311
354+#: qml/Shell.qml:385
331355msgid "Sorry, incorrect passcode."
332356msgstr ""
333357
334−#: qml/Shell.qml:312
358+#: qml/Shell.qml:386
335359msgid "This will be your last attempt."
336360msgstr ""
337361
338−#: qml/Shell.qml:314
362+#: qml/Shell.qml:388
339363msgid ""
340364"If passphrase is entered incorrectly, your phone will conduct a factory "
341365"reset and all personal data will be deleted."
342366msgstr ""
343367
344−#: qml/Shell.qml:315
368+#: qml/Shell.qml:389
345369msgid ""
346370"If passcode is entered incorrectly, your phone will conduct a factory reset "
347371"and all personal data will be deleted."
348372msgstr ""
349373
350−#~ msgid "Restart"
351−#~ msgstr "Επανεκκίνηση"
374+#~ msgid "Hello"
375+#~ msgstr "Γεια σας"
376+
377+#, qt-format
378+#~ msgid "Hello %1"
379+#~ msgstr "Γεια σας %1"
380+
381+#~ msgid "Swipe to unlock"
382+#~ msgstr "Σύρετε για να ξεκλειδώσετε"
383+
384+#~ msgid "Please wait"
385+#~ msgstr "Παρακαλώ περιμένετε"
386+
387+#~ msgid "Too many incorrect attempts"
388+#~ msgstr "Πολλές άκυρες προσπάθειες"
389+
390+#, qt-format
391+#~ msgid "Enter your %1"
392+#~ msgstr "Εισάγετε το %1"
po/en_AU.po+132−89
@@ -7,78 +7,104 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-26 18:24+0200\n"
11−"PO-Revision-Date: 2014-08-27 09:59+0000\n"
10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
11+"PO-Revision-Date: 2014-09-23 01:24+0000\n"
1212"Last-Translator: Jared Norris <jarednorris@ubuntu.com>\n"
1313"Language-Team: English (Australia) <en_AU@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-28 06:30+0000\n"
18−"X-Generator: Launchpad (build 17174)\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"
19+"X-Generator: Launchpad (build 17196)\n"
1920
20−#: plugins/LightDM/Greeter.cpp:129
21+#: plugins/LightDM/Greeter.cpp:130
2122msgid "Password: "
2223msgstr "Password: "
2324
24−#: plugins/Unity/Launcher/launcheritem.cpp:43
25−#: plugins/Unity/Launcher/launcheritem.cpp:73
25+#: plugins/Unity/Launcher/launcheritem.cpp:45
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
2627msgid "Pin shortcut"
2728msgstr "Pin shortcut"
2829
29−#: plugins/Unity/Launcher/launcheritem.cpp:73
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
3031msgid "Unpin shortcut"
3132msgstr "Unpin shortcut"
3233
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
3353#: qml/Components/Dialogs.qml:70
3454msgid "Log out"
35−msgstr ""
55+msgstr "Log out"
3656
3757#: qml/Components/Dialogs.qml:71
3858msgid "Are you sure you want to log out?"
39−msgstr ""
59+msgstr "Are you sure you want to log out?"
4060
4161#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97
4262#: qml/Components/Dialogs.qml:122
4363msgid "No"
44−msgstr ""
64+msgstr "No"
4565
4666#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104
4767#: qml/Components/Dialogs.qml:129
4868msgid "Yes"
49−msgstr ""
69+msgstr "Yes"
5070
5171#: qml/Components/Dialogs.qml:94
5272msgid "Shut down"
53−msgstr ""
73+msgstr "Shut down"
5474
5575#: qml/Components/Dialogs.qml:95
5676msgid "Are you sure you want to shut down?"
57−msgstr ""
77+msgstr "Are you sure you want to shut down?"
5878
5979#: qml/Components/Dialogs.qml:119
6080msgid "Reboot"
61−msgstr ""
81+msgstr "Reboot"
6282
6383#: qml/Components/Dialogs.qml:120
6484msgid "Are you sure you want to reboot?"
65−msgstr ""
85+msgstr "Are you sure you want to reboot?"
6686
6787#: qml/Components/Dialogs.qml:144
6888msgid "Power"
69−msgstr ""
89+msgstr "Power"
7090
7191#: qml/Components/Dialogs.qml:145
7292msgid ""
7393"Are you sure you would like\n"
7494"to power off?"
7595msgstr ""
96+"Are you sure you would like\n"
97+"to power off?"
7698
77−#: qml/Components/Dialogs.qml:144
99+#: qml/Components/Dialogs.qml:147
78100msgid "Power off"
79101msgstr "Power off"
80102
81−#: qml/Components/Dialogs.qml:162
103+#: qml/Components/Dialogs.qml:157
104+msgid "Restart"
105+msgstr "Restart"
106+
107+#: qml/Components/Dialogs.qml:167
82108msgid "Cancel"
83109msgstr "Cancel"
84110
@@ -130,60 +156,44 @@ msgstr ""
130156"You have now mastered the edge gestures and can start using the "
131157"phone<br><br>Tap on the screen to start"
132158
133−#: qml/Components/Lockscreen.qml:167
134−msgid "Please wait"
135−msgstr "Please wait"
136−
137−#: qml/Components/Lockscreen.qml:172
138−msgid "Too many incorrect attempts"
139−msgstr "Too many incorrect attempts"
140−
141−#: qml/Components/Lockscreen.qml:206
159+#: qml/Components/Lockscreen.qml:218
142160msgid "Emergency Call"
143161msgstr "Emergency Call"
144162
145−#: qml/Components/Lockscreen.qml:226
163+#: qml/Components/Lockscreen.qml:250
146164msgid "OK"
147165msgstr "OK"
148166
149−#: qml/Components/PassphraseLockscreen.qml:61
150−#, qt-format
151−msgid "Hello %1"
152−msgstr "Hello %1"
153−
154−#: qml/Components/PassphraseLockscreen.qml:61
155−msgid "Hello"
156−msgstr "Hello"
157−
158−#: qml/Dash/GenericScopeView.qml:361
167+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
159168msgid "See less"
160169msgstr "See less"
161170
162−#: qml/Dash/GenericScopeView.qml:361
171+#: qml/Dash/GenericScopeView.qml:411
163172msgid "See all"
164173msgstr "See all"
165174
166−#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
175+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
176+#: qml/Panel/SearchIndicator.qml:27
167177msgid "Search"
168178msgstr "Search"
169179
170−#: qml/Dash/PageHeader.qml:270
180+#: qml/Dash/PageHeader.qml:268
171181msgid "Settings"
172−msgstr ""
182+msgstr "Settings"
173183
174−#: qml/Dash/PageHeader.qml:279
184+#: qml/Dash/PageHeader.qml:275
175185msgid "Remove from Favorites"
176−msgstr ""
186+msgstr "Remove from Favourites"
177187
178−#: qml/Dash/PageHeader.qml:279
188+#: qml/Dash/PageHeader.qml:275
179189msgid "Add to Favorites"
180−msgstr ""
190+msgstr "Add to Favourites"
181191
182−#: qml/Dash/Previews/PreviewActionCombo.qml:34
192+#: qml/Dash/Previews/PreviewActionCombo.qml:35
183193msgid "More..."
184194msgstr "More..."
185195
186−#: qml/Dash/Previews/PreviewActionCombo.qml:34
196+#: qml/Dash/Previews/PreviewActionCombo.qml:35
187197msgid "Less..."
188198msgstr "Less..."
189199
@@ -199,15 +209,23 @@ msgstr "Add a review"
199209msgid "Send"
200210msgstr "Send"
201211
202−#: qml/Dash/ScopesOverview.qml:201
203−msgid "Manage Dash"
204−msgstr "Manage Dash"
212+#: qml/Dash/PullToRefreshScopeStyle.qml:55
213+msgid "Pull to refresh…"
214+msgstr ""
215+
216+#: qml/Dash/PullToRefreshScopeStyle.qml:60
217+msgid "Release to refresh…"
218+msgstr ""
219+
220+#: qml/Dash/ScopesOverview.qml:206
221+msgid "Manage Scopes"
222+msgstr ""
205223
206−#: qml/Dash/ScopesOverview.qml:408
224+#: qml/Dash/ScopesOverview.qml:428
207225msgid "Done"
208226msgstr "Done"
209227
210−#: qml/Dash/ScopesOverview.qml:434
228+#: qml/Dash/ScopesOverview.qml:454
211229msgid "Store"
212230msgstr "Store"
213231
@@ -220,10 +238,10 @@ msgid "All"
220238msgstr "All"
221239
222240#: qml/Greeter/Greeter.qml:157
223−msgid "Swipe to unlock"
224−msgstr "Swipe to unlock"
241+msgid "Unlock"
242+msgstr ""
225243
226−#: qml/Hud/HudParametrizedActionsPage.qml:132
244+#: qml/Hud/HudParametrizedActionsPage.qml:139
227245msgid "Confirm"
228246msgstr "Confirm"
229247
@@ -243,15 +261,15 @@ msgstr "Speak Now..."
243261msgid "Speaking..."
244262msgstr "Speaking..."
245263
246−#: qml/Notifications/NotificationMenuItemFactory.qml:105
264+#: qml/Notifications/NotificationMenuItemFactory.qml:108
247265msgid "Show password"
248266msgstr "Show password"
249267
250−#: qml/Notifications/NotificationMenuItemFactory.qml:120
268+#: qml/Notifications/NotificationMenuItemFactory.qml:124
251269msgid "Enter SIM PIN"
252270msgstr "Enter SIM PIN"
253271
254−#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
272+#: qml/Notifications/NotificationMenuItemFactory.qml:125
255273msgid "Sorry, incorrect PIN"
256274msgstr "Sorry, incorrect PIN"
257275
@@ -263,27 +281,31 @@ msgstr "Tap to return to call..."
263281msgid "Conference"
264282msgstr "Conference"
265283
266−#: qml/Panel/Indicators/MenuItemFactory.qml:651
284+#: qml/Panel/Indicators/MenuItemFactory.qml:600
285+msgid "Nothing is playing"
286+msgstr ""
287+
288+#: qml/Panel/Indicators/MenuItemFactory.qml:748
267289msgid "In queue…"
268290msgstr "In queue…"
269291
270−#: qml/Panel/Indicators/MenuItemFactory.qml:655
292+#: qml/Panel/Indicators/MenuItemFactory.qml:752
271293msgid "Downloading"
272294msgstr "Downloading"
273295
274−#: qml/Panel/Indicators/MenuItemFactory.qml:657
296+#: qml/Panel/Indicators/MenuItemFactory.qml:754
275297msgid "Paused, tap to resume"
276298msgstr "Paused, tap to resume"
277299
278−#: qml/Panel/Indicators/MenuItemFactory.qml:659
300+#: qml/Panel/Indicators/MenuItemFactory.qml:756
279301msgid "Canceled"
280302msgstr "Cancelled"
281303
282−#: qml/Panel/Indicators/MenuItemFactory.qml:661
304+#: qml/Panel/Indicators/MenuItemFactory.qml:758
283305msgid "Finished"
284306msgstr "Finished"
285307
286−#: qml/Panel/Indicators/MenuItemFactory.qml:663
308+#: qml/Panel/Indicators/MenuItemFactory.qml:760
287309msgid "Failed, tap to retry"
288310msgstr "Failed, tap to retry"
289311
@@ -295,45 +317,49 @@ msgstr "Unlock SIM"
295317msgid "Roaming"
296318msgstr "Roaming"
297319
298−#: qml/Shell.qml:266
299−msgid "Enter your passphrase"
300−msgstr "Enter your passphrase"
320+#: qml/Shell.qml:340
321+msgid "Enter passphrase"
322+msgstr ""
301323
302−#: qml/Shell.qml:267
324+#: qml/Shell.qml:341
303325msgid "Sorry, incorrect passphrase"
304326msgstr "Sorry, incorrect passphrase"
305327
306−#: qml/Shell.qml:282
307−msgid "Enter your passcode"
328+#: qml/Shell.qml:342
329+msgid "Please re-enter"
308330msgstr ""
309331
310−#: qml/Shell.qml:283
311−msgid "Sorry, incorrect passcode"
332+#: qml/Shell.qml:344
333+msgid "Enter passcode"
312334msgstr ""
313335
314−#: qml/Shell.qml:273
336+#: qml/Shell.qml:345
337+msgid "Sorry, incorrect passcode"
338+msgstr "Sorry, incorrect passcode"
339+
340+#: qml/Shell.qml:348
315341#, qt-format
316−msgid "Enter your %1"
317−msgstr "Enter your %1"
342+msgid "Enter %1"
343+msgstr ""
318344
319−#: qml/Shell.qml:274
345+#: qml/Shell.qml:349
320346#, qt-format
321347msgid "Sorry, incorrect %1"
322348msgstr "Sorry, incorrect %1"
323349
324−#: qml/Shell.qml:310
350+#: qml/Shell.qml:384
325351msgid "Sorry, incorrect passphrase."
326352msgstr "Sorry, incorrect passphrase."
327353
328−#: qml/Shell.qml:311
354+#: qml/Shell.qml:385
329355msgid "Sorry, incorrect passcode."
330356msgstr "Sorry, incorrect passcode."
331357
332−#: qml/Shell.qml:312
358+#: qml/Shell.qml:386
333359msgid "This will be your last attempt."
334360msgstr "This will be your last attempt."
335361
336−#: qml/Shell.qml:314
362+#: qml/Shell.qml:388
337363msgid ""
338364"If passphrase is entered incorrectly, your phone will conduct a factory "
339365"reset and all personal data will be deleted."
@@ -341,7 +367,7 @@ msgstr ""
341367"If passphrase is entered incorrectly, your phone will conduct a factory "
342368"reset and all personal data will be deleted."
343369
344−#: qml/Shell.qml:315
370+#: qml/Shell.qml:389
345371msgid ""
346372"If passcode is entered incorrectly, your phone will conduct a factory reset "
347373"and all personal data will be deleted."
@@ -349,11 +375,28 @@ msgstr ""
349375"If passcode is entered incorrectly, your phone will conduct a factory reset "
350376"and all personal data will be deleted."
351377
352−#~ msgid "Are you sure you would like to turn power off?"
353−#~ msgstr "Are you sure you would like to turn power off?"
378+#, qt-format
379+#~ msgid "Hello %1"
380+#~ msgstr "Hello %1"
381+
382+#~ msgid "Hello"
383+#~ msgstr "Hello"
384+
385+#~ msgid "Swipe to unlock"
386+#~ msgstr "Swipe to unlock"
387+
388+#~ msgid "Please wait"
389+#~ msgstr "Please wait"
390+
391+#~ msgid "Too many incorrect attempts"
392+#~ msgstr "Too many incorrect attempts"
393+
394+#, qt-format
395+#~ msgid "Enter your %1"
396+#~ msgstr "Enter your %1"
354397
355−#~ msgid "Restart"
356−#~ msgstr "Restart"
398+#~ msgid "Enter your passphrase"
399+#~ msgstr "Enter your passphrase"
357400
358−#~ msgid "Enter your PIN"
359−#~ msgstr "Enter your PIN"
401+#~ msgid "Enter your passcode"
402+#~ msgstr "Enter your passcode"
po/en_GB.po+134−91
@@ -7,78 +7,104 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-26 18:24+0200\n"
11−"PO-Revision-Date: 2014-08-23 13:48+0000\n"
12−"Last-Translator: Alan Pope ㋛ <alan@ubuntu.com>\n"
10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
11+"PO-Revision-Date: 2014-10-03 12:46+0000\n"
12+"Last-Translator: Andi Chandler <Unknown>\n"
1313"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-28 06:30+0000\n"
18−"X-Generator: Launchpad (build 17174)\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"
19+"X-Generator: Launchpad (build 17196)\n"
1920
20−#: plugins/LightDM/Greeter.cpp:129
21+#: plugins/LightDM/Greeter.cpp:130
2122msgid "Password: "
2223msgstr "Password: "
2324
24−#: plugins/Unity/Launcher/launcheritem.cpp:43
25−#: plugins/Unity/Launcher/launcheritem.cpp:73
25+#: plugins/Unity/Launcher/launcheritem.cpp:45
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
2627msgid "Pin shortcut"
2728msgstr "Pin shortcut"
2829
29−#: plugins/Unity/Launcher/launcheritem.cpp:73
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
3031msgid "Unpin shortcut"
3132msgstr "Unpin shortcut"
3233
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr "Device Locked"
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr "You have been locked out due to too many failed passphrase attempts."
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr "You have been locked out due to too many failed passcode attempts."
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] "Please wait %1 minute and then try again…"
51+msgstr[1] "Please wait %1 minutes and then try again…"
52+
3353#: qml/Components/Dialogs.qml:70
3454msgid "Log out"
35−msgstr ""
55+msgstr "Log out"
3656
3757#: qml/Components/Dialogs.qml:71
3858msgid "Are you sure you want to log out?"
39−msgstr ""
59+msgstr "Are you sure you want to log out?"
4060
4161#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97
4262#: qml/Components/Dialogs.qml:122
4363msgid "No"
44−msgstr ""
64+msgstr "No"
4565
4666#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104
4767#: qml/Components/Dialogs.qml:129
4868msgid "Yes"
49−msgstr ""
69+msgstr "Yes"
5070
5171#: qml/Components/Dialogs.qml:94
5272msgid "Shut down"
53−msgstr ""
73+msgstr "Shut down"
5474
5575#: qml/Components/Dialogs.qml:95
5676msgid "Are you sure you want to shut down?"
57−msgstr ""
77+msgstr "Are you sure you want to shut down?"
5878
5979#: qml/Components/Dialogs.qml:119
6080msgid "Reboot"
61−msgstr ""
81+msgstr "Reboot"
6282
6383#: qml/Components/Dialogs.qml:120
6484msgid "Are you sure you want to reboot?"
65−msgstr ""
85+msgstr "Are you sure you want to reboot?"
6686
6787#: qml/Components/Dialogs.qml:144
6888msgid "Power"
69−msgstr ""
89+msgstr "Power"
7090
7191#: qml/Components/Dialogs.qml:145
7292msgid ""
7393"Are you sure you would like\n"
7494"to power off?"
7595msgstr ""
96+"Are you sure you would like\n"
97+"to power off?"
7698
77−#: qml/Components/Dialogs.qml:144
99+#: qml/Components/Dialogs.qml:147
78100msgid "Power off"
79101msgstr "Power off"
80102
81−#: qml/Components/Dialogs.qml:162
103+#: qml/Components/Dialogs.qml:157
104+msgid "Restart"
105+msgstr "Restart"
106+
107+#: qml/Components/Dialogs.qml:167
82108msgid "Cancel"
83109msgstr "Cancel"
84110
@@ -130,60 +156,44 @@ msgstr ""
130156"You have now mastered the edge gestures and can start using the "
131157"phone<br><br>Tap on the screen to start"
132158
133−#: qml/Components/Lockscreen.qml:167
134−msgid "Please wait"
135−msgstr "Please wait"
136−
137−#: qml/Components/Lockscreen.qml:172
138−msgid "Too many incorrect attempts"
139−msgstr "Too many incorrect attempts"
140−
141−#: qml/Components/Lockscreen.qml:206
159+#: qml/Components/Lockscreen.qml:218
142160msgid "Emergency Call"
143161msgstr "Emergency Call"
144162
145−#: qml/Components/Lockscreen.qml:226
163+#: qml/Components/Lockscreen.qml:250
146164msgid "OK"
147165msgstr "OK"
148166
149−#: qml/Components/PassphraseLockscreen.qml:61
150−#, qt-format
151−msgid "Hello %1"
152−msgstr "Hello %1"
153−
154−#: qml/Components/PassphraseLockscreen.qml:61
155−msgid "Hello"
156−msgstr "Hello"
157−
158−#: qml/Dash/GenericScopeView.qml:361
167+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
159168msgid "See less"
160169msgstr "See less"
161170
162−#: qml/Dash/GenericScopeView.qml:361
171+#: qml/Dash/GenericScopeView.qml:411
163172msgid "See all"
164173msgstr "See all"
165174
166−#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
175+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
176+#: qml/Panel/SearchIndicator.qml:27
167177msgid "Search"
168178msgstr "Search"
169179
170−#: qml/Dash/PageHeader.qml:270
180+#: qml/Dash/PageHeader.qml:268
171181msgid "Settings"
172−msgstr ""
182+msgstr "Settings"
173183
174−#: qml/Dash/PageHeader.qml:279
184+#: qml/Dash/PageHeader.qml:275
175185msgid "Remove from Favorites"
176−msgstr ""
186+msgstr "Remove from Favourites"
177187
178−#: qml/Dash/PageHeader.qml:279
188+#: qml/Dash/PageHeader.qml:275
179189msgid "Add to Favorites"
180−msgstr ""
190+msgstr "Add to Favourites"
181191
182−#: qml/Dash/Previews/PreviewActionCombo.qml:34
192+#: qml/Dash/Previews/PreviewActionCombo.qml:35
183193msgid "More..."
184194msgstr "More..."
185195
186−#: qml/Dash/Previews/PreviewActionCombo.qml:34
196+#: qml/Dash/Previews/PreviewActionCombo.qml:35
187197msgid "Less..."
188198msgstr "Less..."
189199
@@ -199,15 +209,23 @@ msgstr "Add a review"
199209msgid "Send"
200210msgstr "Send"
201211
202−#: qml/Dash/ScopesOverview.qml:201
203−msgid "Manage Dash"
204−msgstr "Manage Dash"
212+#: qml/Dash/PullToRefreshScopeStyle.qml:55
213+msgid "Pull to refresh…"
214+msgstr ""
215+
216+#: qml/Dash/PullToRefreshScopeStyle.qml:60
217+msgid "Release to refresh…"
218+msgstr ""
205219
206−#: qml/Dash/ScopesOverview.qml:408
220+#: qml/Dash/ScopesOverview.qml:206
221+msgid "Manage Scopes"
222+msgstr "Manage Scopes"
223+
224+#: qml/Dash/ScopesOverview.qml:428
207225msgid "Done"
208226msgstr "Done"
209227
210−#: qml/Dash/ScopesOverview.qml:434
228+#: qml/Dash/ScopesOverview.qml:454
211229msgid "Store"
212230msgstr "Store"
213231
@@ -220,10 +238,10 @@ msgid "All"
220238msgstr "All"
221239
222240#: qml/Greeter/Greeter.qml:157
223−msgid "Swipe to unlock"
224−msgstr "Swipe to unlock"
241+msgid "Unlock"
242+msgstr "Unlock"
225243
226−#: qml/Hud/HudParametrizedActionsPage.qml:132
244+#: qml/Hud/HudParametrizedActionsPage.qml:139
227245msgid "Confirm"
228246msgstr "Confirm"
229247
@@ -243,15 +261,15 @@ msgstr "Speak Now..."
243261msgid "Speaking..."
244262msgstr "Speaking..."
245263
246−#: qml/Notifications/NotificationMenuItemFactory.qml:105
264+#: qml/Notifications/NotificationMenuItemFactory.qml:108
247265msgid "Show password"
248266msgstr "Show password"
249267
250−#: qml/Notifications/NotificationMenuItemFactory.qml:120
268+#: qml/Notifications/NotificationMenuItemFactory.qml:124
251269msgid "Enter SIM PIN"
252270msgstr "Enter SIM PIN"
253271
254−#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
272+#: qml/Notifications/NotificationMenuItemFactory.qml:125
255273msgid "Sorry, incorrect PIN"
256274msgstr "Sorry, incorrect PIN"
257275
@@ -263,27 +281,31 @@ msgstr "Tap to return to call..."
263281msgid "Conference"
264282msgstr "Conference"
265283
266−#: qml/Panel/Indicators/MenuItemFactory.qml:651
284+#: qml/Panel/Indicators/MenuItemFactory.qml:600
285+msgid "Nothing is playing"
286+msgstr "Nothing is playing"
287+
288+#: qml/Panel/Indicators/MenuItemFactory.qml:748
267289msgid "In queue…"
268290msgstr "In queue…"
269291
270−#: qml/Panel/Indicators/MenuItemFactory.qml:655
292+#: qml/Panel/Indicators/MenuItemFactory.qml:752
271293msgid "Downloading"
272294msgstr "Downloading"
273295
274−#: qml/Panel/Indicators/MenuItemFactory.qml:657
296+#: qml/Panel/Indicators/MenuItemFactory.qml:754
275297msgid "Paused, tap to resume"
276298msgstr "Paused, tap to resume"
277299
278−#: qml/Panel/Indicators/MenuItemFactory.qml:659
300+#: qml/Panel/Indicators/MenuItemFactory.qml:756
279301msgid "Canceled"
280302msgstr "Cancelled"
281303
282−#: qml/Panel/Indicators/MenuItemFactory.qml:661
304+#: qml/Panel/Indicators/MenuItemFactory.qml:758
283305msgid "Finished"
284306msgstr "Finished"
285307
286−#: qml/Panel/Indicators/MenuItemFactory.qml:663
308+#: qml/Panel/Indicators/MenuItemFactory.qml:760
287309msgid "Failed, tap to retry"
288310msgstr "Failed, tap to retry"
289311
@@ -295,45 +317,49 @@ msgstr "Unlock SIM"
295317msgid "Roaming"
296318msgstr "Roaming"
297319
298−#: qml/Shell.qml:266
299−msgid "Enter your passphrase"
300−msgstr "Enter your passphrase"
320+#: qml/Shell.qml:340
321+msgid "Enter passphrase"
322+msgstr "Enter passphrase"
301323
302−#: qml/Shell.qml:267
324+#: qml/Shell.qml:341
303325msgid "Sorry, incorrect passphrase"
304326msgstr "Sorry, incorrect passphrase"
305327
306−#: qml/Shell.qml:282
307−msgid "Enter your passcode"
308−msgstr ""
328+#: qml/Shell.qml:342
329+msgid "Please re-enter"
330+msgstr "Please re-enter"
331+
332+#: qml/Shell.qml:344
333+msgid "Enter passcode"
334+msgstr "Enter passcode"
309335
310−#: qml/Shell.qml:283
336+#: qml/Shell.qml:345
311337msgid "Sorry, incorrect passcode"
312−msgstr ""
338+msgstr "Sorry, incorrect passcode"
313339
314−#: qml/Shell.qml:273
340+#: qml/Shell.qml:348
315341#, qt-format
316−msgid "Enter your %1"
317−msgstr "Enter your %1"
342+msgid "Enter %1"
343+msgstr "Enter %1"
318344
319−#: qml/Shell.qml:274
345+#: qml/Shell.qml:349
320346#, qt-format
321347msgid "Sorry, incorrect %1"
322348msgstr "Sorry, incorrect %1"
323349
324−#: qml/Shell.qml:310
350+#: qml/Shell.qml:384
325351msgid "Sorry, incorrect passphrase."
326352msgstr "Sorry, incorrect passphrase."
327353
328−#: qml/Shell.qml:311
354+#: qml/Shell.qml:385
329355msgid "Sorry, incorrect passcode."
330356msgstr "Sorry, incorrect passcode."
331357
332−#: qml/Shell.qml:312
358+#: qml/Shell.qml:386
333359msgid "This will be your last attempt."
334360msgstr "This will be your last attempt."
335361
336−#: qml/Shell.qml:314
362+#: qml/Shell.qml:388
337363msgid ""
338364"If passphrase is entered incorrectly, your phone will conduct a factory "
339365"reset and all personal data will be deleted."
@@ -341,7 +367,7 @@ msgstr ""
341367"If passphrase is entered incorrectly, your phone will conduct a factory "
342368"reset and all personal data will be deleted."
343369
344−#: qml/Shell.qml:315
370+#: qml/Shell.qml:389
345371msgid ""
346372"If passcode is entered incorrectly, your phone will conduct a factory reset "
347373"and all personal data will be deleted."
@@ -349,11 +375,28 @@ msgstr ""
349375"If passcode is entered incorrectly, your phone will conduct a factory reset "
350376"and all personal data will be deleted."
351377
352−#~ msgid "Are you sure you would like to turn power off?"
353−#~ msgstr "Are you sure you would like to turn power off?"
378+#, qt-format
379+#~ msgid "Hello %1"
380+#~ msgstr "Hello %1"
381+
382+#~ msgid "Hello"
383+#~ msgstr "Hello"
384+
385+#~ msgid "Swipe to unlock"
386+#~ msgstr "Swipe to unlock"
387+
388+#~ msgid "Please wait"
389+#~ msgstr "Please wait"
390+
391+#~ msgid "Too many incorrect attempts"
392+#~ msgstr "Too many incorrect attempts"
393+
394+#, qt-format
395+#~ msgid "Enter your %1"
396+#~ msgstr "Enter your %1"
354397
355−#~ msgid "Restart"
356−#~ msgstr "Restart"
398+#~ msgid "Enter your passphrase"
399+#~ msgstr "Enter your passphrase"
357400
358−#~ msgid "Enter your PIN"
359−#~ msgstr "Enter your PIN"
401+#~ msgid "Enter your passcode"
402+#~ msgstr "Enter your passcode"
po/eo.po+89−65
@@ -7,29 +7,49 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-26 18:24+0200\n"
10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
1111"PO-Revision-Date: 2013-06-26 22:35+0000\n"
1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313"Language-Team: Esperanto <eo@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-28 06:30+0000\n"
18−"X-Generator: Launchpad (build 17174)\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
18+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"
19+"X-Generator: Launchpad (build 17196)\n"
1920
20−#: plugins/LightDM/Greeter.cpp:129
21+#: plugins/LightDM/Greeter.cpp:130
2122msgid "Password: "
2223msgstr ""
2324
24−#: plugins/Unity/Launcher/launcheritem.cpp:43
25−#: plugins/Unity/Launcher/launcheritem.cpp:73
25+#: plugins/Unity/Launcher/launcheritem.cpp:45
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
2627msgid "Pin shortcut"
2728msgstr ""
2829
29−#: plugins/Unity/Launcher/launcheritem.cpp:73
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
3031msgid "Unpin shortcut"
3132msgstr ""
3233
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
3353#: qml/Components/Dialogs.qml:70
3454msgid "Log out"
3555msgstr ""
@@ -74,11 +94,15 @@ msgid ""
7494"to power off?"
7595msgstr ""
7696
77−#: qml/Components/Dialogs.qml:144
97+#: qml/Components/Dialogs.qml:147
7898msgid "Power off"
7999msgstr ""
80100
81−#: qml/Components/Dialogs.qml:162
101+#: qml/Components/Dialogs.qml:157
102+msgid "Restart"
103+msgstr ""
104+
105+#: qml/Components/Dialogs.qml:167
82106msgid "Cancel"
83107msgstr ""
84108
@@ -128,60 +152,44 @@ msgid ""
128152"phone<br><br>Tap on the screen to start"
129153msgstr ""
130154
131−#: qml/Components/Lockscreen.qml:167
132−msgid "Please wait"
133−msgstr ""
134−
135−#: qml/Components/Lockscreen.qml:172
136−msgid "Too many incorrect attempts"
137−msgstr ""
138−
139−#: qml/Components/Lockscreen.qml:206
155+#: qml/Components/Lockscreen.qml:218
140156msgid "Emergency Call"
141157msgstr ""
142158
143−#: qml/Components/Lockscreen.qml:226
159+#: qml/Components/Lockscreen.qml:250
144160msgid "OK"
145161msgstr ""
146162
147−#: qml/Components/PassphraseLockscreen.qml:61
148−#, qt-format
149−msgid "Hello %1"
150−msgstr ""
151−
152−#: qml/Components/PassphraseLockscreen.qml:61
153−msgid "Hello"
154−msgstr ""
155−
156−#: qml/Dash/GenericScopeView.qml:361
163+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
157164msgid "See less"
158165msgstr ""
159166
160−#: qml/Dash/GenericScopeView.qml:361
167+#: qml/Dash/GenericScopeView.qml:411
161168msgid "See all"
162169msgstr ""
163170
164−#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
171+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
172+#: qml/Panel/SearchIndicator.qml:27
165173msgid "Search"
166174msgstr ""
167175
168−#: qml/Dash/PageHeader.qml:270
176+#: qml/Dash/PageHeader.qml:268
169177msgid "Settings"
170178msgstr ""
171179
172−#: qml/Dash/PageHeader.qml:279
180+#: qml/Dash/PageHeader.qml:275
173181msgid "Remove from Favorites"
174182msgstr ""
175183
176−#: qml/Dash/PageHeader.qml:279
184+#: qml/Dash/PageHeader.qml:275
177185msgid "Add to Favorites"
178186msgstr ""
179187
180−#: qml/Dash/Previews/PreviewActionCombo.qml:34
188+#: qml/Dash/Previews/PreviewActionCombo.qml:35
181189msgid "More..."
182190msgstr ""
183191
184−#: qml/Dash/Previews/PreviewActionCombo.qml:34
192+#: qml/Dash/Previews/PreviewActionCombo.qml:35
185193msgid "Less..."
186194msgstr ""
187195
@@ -197,15 +205,23 @@ msgstr ""
197205msgid "Send"
198206msgstr ""
199207
200−#: qml/Dash/ScopesOverview.qml:201
201−msgid "Manage Dash"
208+#: qml/Dash/PullToRefreshScopeStyle.qml:55
209+msgid "Pull to refresh…"
210+msgstr ""
211+
212+#: qml/Dash/PullToRefreshScopeStyle.qml:60
213+msgid "Release to refresh…"
214+msgstr ""
215+
216+#: qml/Dash/ScopesOverview.qml:206
217+msgid "Manage Scopes"
202218msgstr ""
203219
204−#: qml/Dash/ScopesOverview.qml:408
220+#: qml/Dash/ScopesOverview.qml:428
205221msgid "Done"
206222msgstr ""
207223
208−#: qml/Dash/ScopesOverview.qml:434
224+#: qml/Dash/ScopesOverview.qml:454
209225msgid "Store"
210226msgstr ""
211227
@@ -218,10 +234,10 @@ msgid "All"
218234msgstr ""
219235
220236#: qml/Greeter/Greeter.qml:157
221−msgid "Swipe to unlock"
237+msgid "Unlock"
222238msgstr ""
223239
224−#: qml/Hud/HudParametrizedActionsPage.qml:132
240+#: qml/Hud/HudParametrizedActionsPage.qml:139
225241msgid "Confirm"
226242msgstr ""
227243
@@ -241,15 +257,15 @@ msgstr ""
241257msgid "Speaking..."
242258msgstr ""
243259
244−#: qml/Notifications/NotificationMenuItemFactory.qml:105
260+#: qml/Notifications/NotificationMenuItemFactory.qml:108
245261msgid "Show password"
246262msgstr ""
247263
248−#: qml/Notifications/NotificationMenuItemFactory.qml:120
264+#: qml/Notifications/NotificationMenuItemFactory.qml:124
249265msgid "Enter SIM PIN"
250266msgstr ""
251267
252−#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
268+#: qml/Notifications/NotificationMenuItemFactory.qml:125
253269msgid "Sorry, incorrect PIN"
254270msgstr ""
255271
@@ -261,27 +277,31 @@ msgstr ""
261277msgid "Conference"
262278msgstr ""
263279
264−#: qml/Panel/Indicators/MenuItemFactory.qml:651
280+#: qml/Panel/Indicators/MenuItemFactory.qml:600
281+msgid "Nothing is playing"
282+msgstr ""
283+
284+#: qml/Panel/Indicators/MenuItemFactory.qml:748
265285msgid "In queue…"
266286msgstr ""
267287
268−#: qml/Panel/Indicators/MenuItemFactory.qml:655
288+#: qml/Panel/Indicators/MenuItemFactory.qml:752
269289msgid "Downloading"
270290msgstr ""
271291
272−#: qml/Panel/Indicators/MenuItemFactory.qml:657
292+#: qml/Panel/Indicators/MenuItemFactory.qml:754
273293msgid "Paused, tap to resume"
274294msgstr ""
275295
276−#: qml/Panel/Indicators/MenuItemFactory.qml:659
296+#: qml/Panel/Indicators/MenuItemFactory.qml:756
277297msgid "Canceled"
278298msgstr ""
279299
280−#: qml/Panel/Indicators/MenuItemFactory.qml:661
300+#: qml/Panel/Indicators/MenuItemFactory.qml:758
281301msgid "Finished"
282302msgstr ""
283303
284−#: qml/Panel/Indicators/MenuItemFactory.qml:663
304+#: qml/Panel/Indicators/MenuItemFactory.qml:760
285305msgid "Failed, tap to retry"
286306msgstr ""
287307
@@ -293,51 +313,55 @@ msgstr ""
293313msgid "Roaming"
294314msgstr ""
295315
296−#: qml/Shell.qml:266
297−msgid "Enter your passphrase"
316+#: qml/Shell.qml:340
317+msgid "Enter passphrase"
298318msgstr ""
299319
300−#: qml/Shell.qml:267
320+#: qml/Shell.qml:341
301321msgid "Sorry, incorrect passphrase"
302322msgstr ""
303323
304−#: qml/Shell.qml:282
305−msgid "Enter your passcode"
324+#: qml/Shell.qml:342
325+msgid "Please re-enter"
326+msgstr ""
327+
328+#: qml/Shell.qml:344
329+msgid "Enter passcode"
306330msgstr ""
307331
308−#: qml/Shell.qml:283
332+#: qml/Shell.qml:345
309333msgid "Sorry, incorrect passcode"
310334msgstr ""
311335
312−#: qml/Shell.qml:273
336+#: qml/Shell.qml:348
313337#, qt-format
314−msgid "Enter your %1"
338+msgid "Enter %1"
315339msgstr ""
316340
317−#: qml/Shell.qml:274
341+#: qml/Shell.qml:349
318342#, qt-format
319343msgid "Sorry, incorrect %1"
320344msgstr ""
321345
322−#: qml/Shell.qml:310
346+#: qml/Shell.qml:384
323347msgid "Sorry, incorrect passphrase."
324348msgstr ""
325349
326−#: qml/Shell.qml:311
350+#: qml/Shell.qml:385
327351msgid "Sorry, incorrect passcode."
328352msgstr ""
329353
330−#: qml/Shell.qml:312
354+#: qml/Shell.qml:386
331355msgid "This will be your last attempt."
332356msgstr ""
333357
334−#: qml/Shell.qml:314
358+#: qml/Shell.qml:388
335359msgid ""
336360"If passphrase is entered incorrectly, your phone will conduct a factory "
337361"reset and all personal data will be deleted."
338362msgstr ""
339363
340−#: qml/Shell.qml:315
364+#: qml/Shell.qml:389
341365msgid ""
342366"If passcode is entered incorrectly, your phone will conduct a factory reset "
343367"and all personal data will be deleted."
po/es.po+142−95
@@ -7,78 +7,108 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-26 18:24+0200\n"
11−"PO-Revision-Date: 2014-08-27 15:20+0000\n"
12−"Last-Translator: Leo Arias <leo.arias@canonical.com>\n"
10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
11+"PO-Revision-Date: 2014-10-05 08:50+0000\n"
12+"Last-Translator: Paco Molinero <paco@byasl.com>\n"
1313"Language-Team: Spanish <es@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-28 06:30+0000\n"
18−"X-Generator: Launchpad (build 17174)\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"
19+"X-Generator: Launchpad (build 17196)\n"
1920
20−#: plugins/LightDM/Greeter.cpp:129
21+#: plugins/LightDM/Greeter.cpp:130
2122msgid "Password: "
2223msgstr "Contraseña: "
2324
24−#: plugins/Unity/Launcher/launcheritem.cpp:43
25−#: plugins/Unity/Launcher/launcheritem.cpp:73
25+#: plugins/Unity/Launcher/launcheritem.cpp:45
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
2627msgid "Pin shortcut"
2728msgstr "Anclar"
2829
29−#: plugins/Unity/Launcher/launcheritem.cpp:73
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
3031msgid "Unpin shortcut"
3132msgstr "Desanclar"
3233
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr "Dispositivo bloqueado"
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+"Se ha proporcionado una contraseña errónea demasiadas veces. Se ha bloqueado "
42+"el dispositivo."
43+
44+#: qml/Components/DelayedLockscreen.qml:63
45+msgid "You have been locked out due to too many failed passcode attempts."
46+msgstr ""
47+"Se ha bloqueado el dispositivo debido al gran número de intentos fallidos de "
48+"desbloqueo."
49+
50+#: qml/Components/DelayedLockscreen.qml:72
51+#, qt-format
52+msgid "Please wait %1 minute and then try again…"
53+msgid_plural "Please wait %1 minutes and then try again…"
54+msgstr[0] "Espere %1 minuto e inténtelo de nuevo..."
55+msgstr[1] "Espere %1 minutos e inténtelo de nuevo..."
56+
3357#: qml/Components/Dialogs.qml:70
3458msgid "Log out"
35−msgstr ""
59+msgstr "Cerrar la sesión"
3660
3761#: qml/Components/Dialogs.qml:71
3862msgid "Are you sure you want to log out?"
39−msgstr ""
63+msgstr "̉¿Está seguro de que quiere cerrar la sesión?"
4064
4165#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97
4266#: qml/Components/Dialogs.qml:122
4367msgid "No"
44−msgstr ""
68+msgstr "No"
4569
4670#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104
4771#: qml/Components/Dialogs.qml:129
4872msgid "Yes"
49−msgstr ""
73+msgstr "Sí"
5074
5175#: qml/Components/Dialogs.qml:94
5276msgid "Shut down"
53−msgstr ""
77+msgstr "Apagar"
5478
5579#: qml/Components/Dialogs.qml:95
5680msgid "Are you sure you want to shut down?"
57−msgstr ""
81+msgstr "¿Está seguro de que quiere apagar?"
5882
5983#: qml/Components/Dialogs.qml:119
6084msgid "Reboot"
61−msgstr ""
85+msgstr "Reiniciar"
6286
6387#: qml/Components/Dialogs.qml:120
6488msgid "Are you sure you want to reboot?"
65−msgstr ""
89+msgstr "¿Esta seguro de que quiere reiniciar?"
6690
6791#: qml/Components/Dialogs.qml:144
6892msgid "Power"
69−msgstr ""
93+msgstr "Apagar"
7094
7195#: qml/Components/Dialogs.qml:145
7296msgid ""
7397"Are you sure you would like\n"
7498"to power off?"
7599msgstr ""
100+"¿Está seguro de que quiere\n"
101+"apagar?"
76102
77−#: qml/Components/Dialogs.qml:144
103+#: qml/Components/Dialogs.qml:147
78104msgid "Power off"
79105msgstr "Apagar"
80106
81−#: qml/Components/Dialogs.qml:162
107+#: qml/Components/Dialogs.qml:157
108+msgid "Restart"
109+msgstr "Reiniciar"
110+
111+#: qml/Components/Dialogs.qml:167
82112msgid "Cancel"
83113msgstr "Cancelar"
84114
@@ -133,60 +163,44 @@ msgstr ""
133163"Ahora domina los gestos de los bordes y puede usar el teléfono<br><br>Toque "
134164"la pantalla para comenzar"
135165
136−#: qml/Components/Lockscreen.qml:167
137−msgid "Please wait"
138−msgstr "Espere un momento"
139−
140−#: qml/Components/Lockscreen.qml:172
141−msgid "Too many incorrect attempts"
142−msgstr "Demasiados intentos incorrectos"
143−
144−#: qml/Components/Lockscreen.qml:206
166+#: qml/Components/Lockscreen.qml:218
145167msgid "Emergency Call"
146168msgstr "Llamada de emergencia"
147169
148−#: qml/Components/Lockscreen.qml:226
170+#: qml/Components/Lockscreen.qml:250
149171msgid "OK"
150172msgstr "Aceptar"
151173
152−#: qml/Components/PassphraseLockscreen.qml:61
153−#, qt-format
154−msgid "Hello %1"
155−msgstr "Hola, %1"
156−
157−#: qml/Components/PassphraseLockscreen.qml:61
158−msgid "Hello"
159−msgstr "Hola"
160−
161−#: qml/Dash/GenericScopeView.qml:361
174+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
162175msgid "See less"
163176msgstr "Ver menos"
164177
165−#: qml/Dash/GenericScopeView.qml:361
178+#: qml/Dash/GenericScopeView.qml:411
166179msgid "See all"
167180msgstr "Ver todo"
168181
169−#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
182+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
183+#: qml/Panel/SearchIndicator.qml:27
170184msgid "Search"
171185msgstr "Buscar"
172186
173−#: qml/Dash/PageHeader.qml:270
187+#: qml/Dash/PageHeader.qml:268
174188msgid "Settings"
175−msgstr ""
189+msgstr "Configuración"
176190
177−#: qml/Dash/PageHeader.qml:279
191+#: qml/Dash/PageHeader.qml:275
178192msgid "Remove from Favorites"
179−msgstr ""
193+msgstr "Quitar de favoritos"
180194
181−#: qml/Dash/PageHeader.qml:279
195+#: qml/Dash/PageHeader.qml:275
182196msgid "Add to Favorites"
183−msgstr ""
197+msgstr "Añadir a favoritos"
184198
185−#: qml/Dash/Previews/PreviewActionCombo.qml:34
199+#: qml/Dash/Previews/PreviewActionCombo.qml:35
186200msgid "More..."
187201msgstr "Más…"
188202
189−#: qml/Dash/Previews/PreviewActionCombo.qml:34
203+#: qml/Dash/Previews/PreviewActionCombo.qml:35
190204msgid "Less..."
191205msgstr "Menos…"
192206
@@ -202,15 +216,23 @@ msgstr "Añadir una reseña"
202216msgid "Send"
203217msgstr "Enviar"
204218
205−#: qml/Dash/ScopesOverview.qml:201
206−msgid "Manage Dash"
207−msgstr "Gestionar tablero"
219+#: qml/Dash/PullToRefreshScopeStyle.qml:55
220+msgid "Pull to refresh…"
221+msgstr ""
222+
223+#: qml/Dash/PullToRefreshScopeStyle.qml:60
224+msgid "Release to refresh…"
225+msgstr ""
208226
209−#: qml/Dash/ScopesOverview.qml:408
227+#: qml/Dash/ScopesOverview.qml:206
228+msgid "Manage Scopes"
229+msgstr "Administrar ámbitos"
230+
231+#: qml/Dash/ScopesOverview.qml:428
210232msgid "Done"
211233msgstr "Hecho"
212234
213−#: qml/Dash/ScopesOverview.qml:434
235+#: qml/Dash/ScopesOverview.qml:454
214236msgid "Store"
215237msgstr "Tienda"
216238
@@ -223,10 +245,10 @@ msgid "All"
223245msgstr "Todo"
224246
225247#: qml/Greeter/Greeter.qml:157
226−msgid "Swipe to unlock"
227−msgstr "Deslice para desbloquear"
248+msgid "Unlock"
249+msgstr "Desbloquear"
228250
229−#: qml/Hud/HudParametrizedActionsPage.qml:132
251+#: qml/Hud/HudParametrizedActionsPage.qml:139
230252msgid "Confirm"
231253msgstr "Confirmar"
232254
@@ -246,15 +268,15 @@ msgstr "Hable ahora…"
246268msgid "Speaking..."
247269msgstr "Hablando…"
248270
249−#: qml/Notifications/NotificationMenuItemFactory.qml:105
271+#: qml/Notifications/NotificationMenuItemFactory.qml:108
250272msgid "Show password"
251273msgstr "Mostrar contraseña"
252274
253−#: qml/Notifications/NotificationMenuItemFactory.qml:120
275+#: qml/Notifications/NotificationMenuItemFactory.qml:124
254276msgid "Enter SIM PIN"
255277msgstr "Escriba el PIN de la SIM"
256278
257−#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
279+#: qml/Notifications/NotificationMenuItemFactory.qml:125
258280msgid "Sorry, incorrect PIN"
259281msgstr "El PIN es incorrecto"
260282
@@ -266,27 +288,31 @@ msgstr "Toque para volver a llamar..."
266288msgid "Conference"
267289msgstr "Conferencia"
268290
269−#: qml/Panel/Indicators/MenuItemFactory.qml:651
291+#: qml/Panel/Indicators/MenuItemFactory.qml:600
292+msgid "Nothing is playing"
293+msgstr "Ningún contenido en reproducción"
294+
295+#: qml/Panel/Indicators/MenuItemFactory.qml:748
270296msgid "In queue…"
271297msgstr "En espera…"
272298
273−#: qml/Panel/Indicators/MenuItemFactory.qml:655
299+#: qml/Panel/Indicators/MenuItemFactory.qml:752
274300msgid "Downloading"
275301msgstr "Descargando"
276302
277−#: qml/Panel/Indicators/MenuItemFactory.qml:657
303+#: qml/Panel/Indicators/MenuItemFactory.qml:754
278304msgid "Paused, tap to resume"
279305msgstr "Pausado, toque para reanudar"
280306
281−#: qml/Panel/Indicators/MenuItemFactory.qml:659
307+#: qml/Panel/Indicators/MenuItemFactory.qml:756
282308msgid "Canceled"
283309msgstr "Cancelado"
284310
285−#: qml/Panel/Indicators/MenuItemFactory.qml:661
311+#: qml/Panel/Indicators/MenuItemFactory.qml:758
286312msgid "Finished"
287313msgstr "Finalizado"
288314
289−#: qml/Panel/Indicators/MenuItemFactory.qml:663
315+#: qml/Panel/Indicators/MenuItemFactory.qml:760
290316msgid "Failed, tap to retry"
291317msgstr "Falló, toque para reintentar"
292318
@@ -298,45 +324,49 @@ msgstr "Desbloquear SIM"
298324msgid "Roaming"
299325msgstr "Itinerancia"
300326
301−#: qml/Shell.qml:266
302−msgid "Enter your passphrase"
303−msgstr "Introudzca su contraseña"
327+#: qml/Shell.qml:340
328+msgid "Enter passphrase"
329+msgstr "Introduzca la contraseña"
304330
305−#: qml/Shell.qml:267
331+#: qml/Shell.qml:341
306332msgid "Sorry, incorrect passphrase"
307−msgstr "Lo sentimos, contraseña incorrecta"
333+msgstr "La contraseña es incorrecta"
308334
309−#: qml/Shell.qml:282
310−msgid "Enter your passcode"
311−msgstr ""
335+#: qml/Shell.qml:342
336+msgid "Please re-enter"
337+msgstr "Reintroduzca"
338+
339+#: qml/Shell.qml:344
340+msgid "Enter passcode"
341+msgstr "Introduzca el código"
312342
313−#: qml/Shell.qml:283
343+#: qml/Shell.qml:345
314344msgid "Sorry, incorrect passcode"
315−msgstr ""
345+msgstr "El código es incorrecto"
316346
317−#: qml/Shell.qml:273
347+#: qml/Shell.qml:348
318348#, qt-format
319−msgid "Enter your %1"
320−msgstr "Introduzca su %1"
349+msgid "Enter %1"
350+msgstr "Introduzca %1"
321351
322−#: qml/Shell.qml:274
352+#: qml/Shell.qml:349
323353#, qt-format
324354msgid "Sorry, incorrect %1"
325−msgstr "Lo sentimos, %1 incorrecto"
355+msgstr "Incorrecto (%1)"
326356
327−#: qml/Shell.qml:310
357+#: qml/Shell.qml:384
328358msgid "Sorry, incorrect passphrase."
329−msgstr "Frase de paso incorrecta"
359+msgstr "La contraseña es incorrecta."
330360
331−#: qml/Shell.qml:311
361+#: qml/Shell.qml:385
332362msgid "Sorry, incorrect passcode."
333−msgstr "Código de paso incorrecto"
363+msgstr "Código de acceso incorrecto."
334364
335−#: qml/Shell.qml:312
365+#: qml/Shell.qml:386
336366msgid "This will be your last attempt."
337367msgstr "Este será su último intento."
338368
339−#: qml/Shell.qml:314
369+#: qml/Shell.qml:388
340370msgid ""
341371"If passphrase is entered incorrectly, your phone will conduct a factory "
342372"reset and all personal data will be deleted."
@@ -344,7 +374,7 @@ msgstr ""
344374"Si se introduce la frase incorrectamente, el teléfono volverá a la "
345375"configuración de fábrica y se perderán todos los datos personales."
346376
347−#: qml/Shell.qml:315
377+#: qml/Shell.qml:389
348378msgid ""
349379"If passcode is entered incorrectly, your phone will conduct a factory reset "
350380"and all personal data will be deleted."
@@ -352,11 +382,28 @@ msgstr ""
352382"Si se introduce el código incorrectamente, el teléfono volverá a la "
353383"configuración de fábrica y se perderán todos los datos personales."
354384
355−#~ msgid "Restart"
356−#~ msgstr "Reiniciar"
385+#~ msgid "Hello"
386+#~ msgstr "Hola"
387+
388+#, qt-format
389+#~ msgid "Hello %1"
390+#~ msgstr "Hola, %1"
391+
392+#~ msgid "Swipe to unlock"
393+#~ msgstr "Deslice para desbloquear"
394+
395+#~ msgid "Please wait"
396+#~ msgstr "Espere un momento"
397+
398+#~ msgid "Too many incorrect attempts"
399+#~ msgstr "Demasiados intentos incorrectos"
400+
401+#, qt-format
402+#~ msgid "Enter your %1"
403+#~ msgstr "Introduzca su %1"
357404
358−#~ msgid "Are you sure you would like to turn power off?"
359−#~ msgstr "¿Está seguro de que quiere apagarlo?"
405+#~ msgid "Enter your passcode"
406+#~ msgstr "Escriba su código de acceso"
360407
361−#~ msgid "Enter your PIN"
362−#~ msgstr "Escriba el PIN"
408+#~ msgid "Enter your passphrase"
409+#~ msgstr "Escriba su contraseña"
po/eu.po+160−103
@@ -7,80 +7,107 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-26 18:24+0200\n"
11−"PO-Revision-Date: 2014-08-06 22:51+0000\n"
10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
11+"PO-Revision-Date: 2014-10-04 01:50+0000\n"
1212"Last-Translator: Ibai Oihanguren Sala <Unknown>\n"
1313"Language-Team: Basque <eu@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-28 06:29+0000\n"
18−"X-Generator: Launchpad (build 17174)\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
18+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"
19+"X-Generator: Launchpad (build 17196)\n"
1920
20−#: plugins/LightDM/Greeter.cpp:129
21+#: plugins/LightDM/Greeter.cpp:130
2122msgid "Password: "
22−msgstr ""
23+msgstr "Pasahitza: "
2324
24−#: plugins/Unity/Launcher/launcheritem.cpp:43
25−#: plugins/Unity/Launcher/launcheritem.cpp:73
25+#: plugins/Unity/Launcher/launcheritem.cpp:45
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
2627msgid "Pin shortcut"
2728msgstr "Ainguratu lasterbidea"
2829
29−#: plugins/Unity/Launcher/launcheritem.cpp:73
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
3031msgid "Unpin shortcut"
3132msgstr "Askatu lasterbidea"
3233
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr "Gailua blokeatuta"
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+"Gailua blokeatu da, pasaesaldia sartzeko saiakera gehiegi hutsegin "
42+"dituzulako."
43+
44+#: qml/Components/DelayedLockscreen.qml:63
45+msgid "You have been locked out due to too many failed passcode attempts."
46+msgstr ""
47+"Gailua blokeatu da, pasakodea sartzeko saiakera gehiegi hutsegin dituzulako."
48+
49+#: qml/Components/DelayedLockscreen.qml:72
50+#, qt-format
51+msgid "Please wait %1 minute and then try again…"
52+msgid_plural "Please wait %1 minutes and then try again…"
53+msgstr[0] "Itxaron minutu %1ez eta saiatu berriro…"
54+msgstr[1] "Itxaron %1 minutuz eta saiatu berriro…"
55+
3356#: qml/Components/Dialogs.qml:70
3457msgid "Log out"
35−msgstr ""
58+msgstr "Amaitu saioa"
3659
3760#: qml/Components/Dialogs.qml:71
3861msgid "Are you sure you want to log out?"
39−msgstr ""
62+msgstr "Ziur saioa amaitu nahi duzula?"
4063
4164#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97
4265#: qml/Components/Dialogs.qml:122
4366msgid "No"
44−msgstr ""
67+msgstr "Ez"
4568
4669#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104
4770#: qml/Components/Dialogs.qml:129
4871msgid "Yes"
49−msgstr ""
72+msgstr "Bai"
5073
5174#: qml/Components/Dialogs.qml:94
5275msgid "Shut down"
53−msgstr ""
76+msgstr "Itzali"
5477
5578#: qml/Components/Dialogs.qml:95
5679msgid "Are you sure you want to shut down?"
57−msgstr ""
80+msgstr "Ziur itzali nahi duzula?"
5881
5982#: qml/Components/Dialogs.qml:119
6083msgid "Reboot"
61−msgstr ""
84+msgstr "Berrabiarazi"
6285
6386#: qml/Components/Dialogs.qml:120
6487msgid "Are you sure you want to reboot?"
65−msgstr ""
88+msgstr "Ziur berrabiarazi nahi duzula?"
6689
6790#: qml/Components/Dialogs.qml:144
6891msgid "Power"
69−msgstr ""
92+msgstr "Piztu/itzali"
7093
7194#: qml/Components/Dialogs.qml:145
7295msgid ""
7396"Are you sure you would like\n"
7497"to power off?"
75−msgstr ""
98+msgstr "Ziur itzali nahi duzula?"
7699
77−#: qml/Components/Dialogs.qml:144
100+#: qml/Components/Dialogs.qml:147
78101msgid "Power off"
79−msgstr ""
102+msgstr "Itzali"
80103
81−#: qml/Components/Dialogs.qml:162
104+#: qml/Components/Dialogs.qml:157
105+msgid "Restart"
106+msgstr "Berrabiarazi"
107+
108+#: qml/Components/Dialogs.qml:167
82109msgid "Cancel"
83−msgstr ""
110+msgstr "Utzi"
84111
85112#: qml/Components/EdgeDemoOverlay.qml:151
86113msgid "Skip intro"
@@ -118,7 +145,7 @@ msgstr "Ezkerreko ertza"
118145#: qml/Components/EdgeDemo.qml:199
119146msgid "Swipe from the left to reveal the launcher for quick access to apps"
120147msgstr ""
121−"Pasatu hatza ezkerretik abiarazlea erakutsi eta aplikazioak eskura berehala "
148+"Pasatu hatza ezkerretik abiarazlea erakutsi eta aplikazioak berehala eskura "
122149"izateko"
123150
124151#: qml/Components/EdgeDemo.qml:226
@@ -133,60 +160,44 @@ msgstr ""
133160"Jadanik ezagutzen dituzu ertzetako keinuak, eta mugikorra erabiltzen has "
134161"zaitezke<br><br>Sakatu pantailan hasteko"
135162
136−#: qml/Components/Lockscreen.qml:167
137−msgid "Please wait"
138−msgstr ""
139−
140−#: qml/Components/Lockscreen.qml:172
141−msgid "Too many incorrect attempts"
142−msgstr ""
143−
144−#: qml/Components/Lockscreen.qml:206
163+#: qml/Components/Lockscreen.qml:218
145164msgid "Emergency Call"
146165msgstr "Larrialdi-deia"
147166
148−#: qml/Components/Lockscreen.qml:226
167+#: qml/Components/Lockscreen.qml:250
149168msgid "OK"
150169msgstr "Ados"
151170
152−#: qml/Components/PassphraseLockscreen.qml:61
153−#, qt-format
154−msgid "Hello %1"
155−msgstr "Kaixo %1"
156−
157−#: qml/Components/PassphraseLockscreen.qml:61
158−msgid "Hello"
159−msgstr "Kaixo"
160−
161−#: qml/Dash/GenericScopeView.qml:361
171+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
162172msgid "See less"
163173msgstr "Ikusi gutxiago"
164174
165−#: qml/Dash/GenericScopeView.qml:361
175+#: qml/Dash/GenericScopeView.qml:411
166176msgid "See all"
167177msgstr "Ikusi guztiak"
168178
169−#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
179+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
180+#: qml/Panel/SearchIndicator.qml:27
170181msgid "Search"
171182msgstr "Bilatu"
172183
173−#: qml/Dash/PageHeader.qml:270
184+#: qml/Dash/PageHeader.qml:268
174185msgid "Settings"
175−msgstr ""
186+msgstr "Ezarpenak"
176187
177−#: qml/Dash/PageHeader.qml:279
188+#: qml/Dash/PageHeader.qml:275
178189msgid "Remove from Favorites"
179−msgstr ""
190+msgstr "Kendu gogokoetatik"
180191
181−#: qml/Dash/PageHeader.qml:279
192+#: qml/Dash/PageHeader.qml:275
182193msgid "Add to Favorites"
183−msgstr ""
194+msgstr "Gehitu gogokoetara"
184195
185−#: qml/Dash/Previews/PreviewActionCombo.qml:34
196+#: qml/Dash/Previews/PreviewActionCombo.qml:35
186197msgid "More..."
187198msgstr "Gehiago..."
188199
189−#: qml/Dash/Previews/PreviewActionCombo.qml:34
200+#: qml/Dash/Previews/PreviewActionCombo.qml:35
190201msgid "Less..."
191202msgstr "Gutxiago..."
192203
@@ -202,33 +213,41 @@ msgstr "Gehitu kritika"
202213msgid "Send"
203214msgstr "Bidali"
204215
205−#: qml/Dash/ScopesOverview.qml:201
206−msgid "Manage Dash"
216+#: qml/Dash/PullToRefreshScopeStyle.qml:55
217+msgid "Pull to refresh…"
207218msgstr ""
208219
209−#: qml/Dash/ScopesOverview.qml:408
210−msgid "Done"
220+#: qml/Dash/PullToRefreshScopeStyle.qml:60
221+msgid "Release to refresh…"
211222msgstr ""
212223
213−#: qml/Dash/ScopesOverview.qml:434
224+#: qml/Dash/ScopesOverview.qml:206
225+msgid "Manage Scopes"
226+msgstr "Kudeatu eremuak"
227+
228+#: qml/Dash/ScopesOverview.qml:428
229+msgid "Done"
230+msgstr "Eginda"
231+
232+#: qml/Dash/ScopesOverview.qml:454
214233msgid "Store"
215−msgstr ""
234+msgstr "Denda"
216235
217236#: qml/Dash/ScopesOverviewTab.qml:36
218237msgid "Favorites"
219−msgstr ""
238+msgstr "Gogokoak"
220239
221240#: qml/Dash/ScopesOverviewTab.qml:54
222241msgid "All"
223−msgstr ""
242+msgstr "Guztiak"
224243
225244#: qml/Greeter/Greeter.qml:157
226−msgid "Swipe to unlock"
227−msgstr "Pasatu hatza desblokeatzeko"
245+msgid "Unlock"
246+msgstr "Desblokeatu"
228247
229−#: qml/Hud/HudParametrizedActionsPage.qml:132
248+#: qml/Hud/HudParametrizedActionsPage.qml:139
230249msgid "Confirm"
231−msgstr "Baieztatu"
250+msgstr "Berretsi"
232251
233252#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
234253msgid "Type or say a command"
@@ -246,104 +265,142 @@ msgstr "Hitz egin orain..."
246265msgid "Speaking..."
247266msgstr "Hitz egiten..."
248267
249−#: qml/Notifications/NotificationMenuItemFactory.qml:105
268+#: qml/Notifications/NotificationMenuItemFactory.qml:108
250269msgid "Show password"
251270msgstr "Erakutsi pasahitza"
252271
253−#: qml/Notifications/NotificationMenuItemFactory.qml:120
272+#: qml/Notifications/NotificationMenuItemFactory.qml:124
254273msgid "Enter SIM PIN"
255−msgstr ""
274+msgstr "Sartu SIMaren PINa"
256275
257−#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
276+#: qml/Notifications/NotificationMenuItemFactory.qml:125
258277msgid "Sorry, incorrect PIN"
259−msgstr ""
278+msgstr "Sentitzen dugu, PINa okerrekoa da"
260279
261280#: qml/Panel/ActiveCallHint.qml:77
262281msgid "Tap to return to call..."
263−msgstr "Sakatu deia itzultzeko..."
282+msgstr "Sakatu deira itzultzeko..."
264283
265284#: qml/Panel/ActiveCallHint.qml:90
266285msgid "Conference"
267286msgstr "Konferentzia"
268287
269−#: qml/Panel/Indicators/MenuItemFactory.qml:651
288+#: qml/Panel/Indicators/MenuItemFactory.qml:600
289+msgid "Nothing is playing"
290+msgstr "Ez dago ezer erreproduzitzen"
291+
292+#: qml/Panel/Indicators/MenuItemFactory.qml:748
270293msgid "In queue…"
271294msgstr "Ilaran..."
272295
273−#: qml/Panel/Indicators/MenuItemFactory.qml:655
296+#: qml/Panel/Indicators/MenuItemFactory.qml:752
274297msgid "Downloading"
275298msgstr "Deskargatzen"
276299
277−#: qml/Panel/Indicators/MenuItemFactory.qml:657
300+#: qml/Panel/Indicators/MenuItemFactory.qml:754
278301msgid "Paused, tap to resume"
279302msgstr "Pausatuta, sakatu jarraitzeko"
280303
281−#: qml/Panel/Indicators/MenuItemFactory.qml:659
304+#: qml/Panel/Indicators/MenuItemFactory.qml:756
282305msgid "Canceled"
283306msgstr "Utzita"
284307
285−#: qml/Panel/Indicators/MenuItemFactory.qml:661
308+#: qml/Panel/Indicators/MenuItemFactory.qml:758
286309msgid "Finished"
287310msgstr "Amaituta"
288311
289−#: qml/Panel/Indicators/MenuItemFactory.qml:663
312+#: qml/Panel/Indicators/MenuItemFactory.qml:760
290313msgid "Failed, tap to retry"
291314msgstr "Huts egin du, sakatu berriro saiatzeko"
292315
293316#: qml/Panel/Indicators/ModemInfoItem.qml:105
294317msgid "Unlock SIM"
295−msgstr ""
318+msgstr "Desblokeatu SIMa"
296319
297320#: qml/Panel/Indicators/RoamingIndication.qml:27
298321msgid "Roaming"
299−msgstr ""
322+msgstr "Ibiltaritza"
300323
301−#: qml/Shell.qml:266
302−msgid "Enter your passphrase"
303−msgstr ""
324+#: qml/Shell.qml:340
325+msgid "Enter passphrase"
326+msgstr "Sartu pasaesaldia"
304327
305−#: qml/Shell.qml:267
328+#: qml/Shell.qml:341
306329msgid "Sorry, incorrect passphrase"
307−msgstr ""
330+msgstr "Sentitzen dugu, pasaesaldia okerrekoa da"
308331
309−#: qml/Shell.qml:282
310−msgid "Enter your passcode"
311−msgstr ""
332+#: qml/Shell.qml:342
333+msgid "Please re-enter"
334+msgstr "Errepikatu"
335+
336+#: qml/Shell.qml:344
337+msgid "Enter passcode"
338+msgstr "Sartu pasakodea"
312339
313−#: qml/Shell.qml:283
340+#: qml/Shell.qml:345
314341msgid "Sorry, incorrect passcode"
315−msgstr ""
342+msgstr "Sentitzen dugu, pasakodea okerrekoa da"
316343
317−#: qml/Shell.qml:273
344+#: qml/Shell.qml:348
318345#, qt-format
319−msgid "Enter your %1"
320−msgstr ""
346+msgid "Enter %1"
347+msgstr "Sartu %1"
321348
322−#: qml/Shell.qml:274
349+#: qml/Shell.qml:349
323350#, qt-format
324351msgid "Sorry, incorrect %1"
325−msgstr ""
352+msgstr "Sentitzen dugu, %1 okerrekoa da"
326353
327−#: qml/Shell.qml:310
354+#: qml/Shell.qml:384
328355msgid "Sorry, incorrect passphrase."
329−msgstr ""
356+msgstr "Sentitzen dugu, pasaesaldia okerrekoa da."
330357
331−#: qml/Shell.qml:311
358+#: qml/Shell.qml:385
332359msgid "Sorry, incorrect passcode."
333−msgstr ""
360+msgstr "Sentitzen dugu, pasakodea okerrekoa da."
334361
335−#: qml/Shell.qml:312
362+#: qml/Shell.qml:386
336363msgid "This will be your last attempt."
337−msgstr ""
364+msgstr "Hau duzu azken saiakera."
338365
339−#: qml/Shell.qml:314
366+#: qml/Shell.qml:388
340367msgid ""
341368"If passphrase is entered incorrectly, your phone will conduct a factory "
342369"reset and all personal data will be deleted."
343370msgstr ""
371+"Okerreko pasaesaldia sartzen baduzu, telefonoaren jatorrizko ezarpenak "
372+"berrezarri eta datu pertsonal guztiak ezabatuko dira."
344373
345−#: qml/Shell.qml:315
374+#: qml/Shell.qml:389
346375msgid ""
347376"If passcode is entered incorrectly, your phone will conduct a factory reset "
348377"and all personal data will be deleted."
349378msgstr ""
379+"Okerreko pasakodea sartzen baduzu, telefonoaren jatorrizko ezarpenak "
380+"berrezarri eta datu pertsonal guztiak ezabatuko dira."
381+
382+#, qt-format
383+#~ msgid "Hello %1"
384+#~ msgstr "Kaixo %1"
385+
386+#~ msgid "Hello"
387+#~ msgstr "Kaixo"
388+
389+#~ msgid "Swipe to unlock"
390+#~ msgstr "Pasatu hatza desblokeatzeko"
391+
392+#~ msgid "Please wait"
393+#~ msgstr "Itxaron"
394+
395+#~ msgid "Too many incorrect attempts"
396+#~ msgstr "Okerreko saiakera gehiegi"
397+
398+#~ msgid "Enter your passphrase"
399+#~ msgstr "Sartu pasaesaldia"
400+
401+#~ msgid "Enter your passcode"
402+#~ msgstr "Sartu pasakodea"
403+
404+#, qt-format
405+#~ msgid "Enter your %1"
406+#~ msgstr "Sartu %1"
po/fa.po+119−75
@@ -7,29 +7,49 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-26 18:24+0200\n"
11−"PO-Revision-Date: 2014-08-27 20:08+0000\n"
10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
11+"PO-Revision-Date: 2014-10-02 23:07+0000\n"
1212"Last-Translator: Danial Behzadi <dani.behzi@gmail.com>\n"
1313"Language-Team: Persian <fa@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-28 06:30+0000\n"
18−"X-Generator: Launchpad (build 17174)\n"
17+"Plural-Forms: nplurals=1; plural=0;\n"
18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"
19+"X-Generator: Launchpad (build 17196)\n"
1920
20−#: plugins/LightDM/Greeter.cpp:129
21+#: plugins/LightDM/Greeter.cpp:130
2122msgid "Password: "
2223msgstr "گذرواژه: "
2324
24−#: plugins/Unity/Launcher/launcheritem.cpp:43
25−#: plugins/Unity/Launcher/launcheritem.cpp:73
25+#: plugins/Unity/Launcher/launcheritem.cpp:45
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
2627msgid "Pin shortcut"
2728msgstr "سنجاق کردن میانبر"
2829
29−#: plugins/Unity/Launcher/launcheritem.cpp:73
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
3031msgid "Unpin shortcut"
3132msgstr "برداشتن سنجاق میانبر"
3233
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr "دستگاه قفل شد"
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+"شما به دلیل تلاش‌های بسیار زیاد شکست خورده برای عبارت‌عبور قفل شده‌اید."
42+
43+#: qml/Components/DelayedLockscreen.qml:63
44+msgid "You have been locked out due to too many failed passcode attempts."
45+msgstr "شما به دلیل تلاش‌های بسیار زیاد شکست خورده برای رمزعبور قفل شده‌اید."
46+
47+#: qml/Components/DelayedLockscreen.qml:72
48+#, qt-format
49+msgid "Please wait %1 minute and then try again…"
50+msgid_plural "Please wait %1 minutes and then try again…"
51+msgstr[0] "لطفاُ %1 دقیقه صبر نموده و سپس مجدّداً تلاش نمایید…"
52+
3353#: qml/Components/Dialogs.qml:70
3454msgid "Log out"
3555msgstr "خروج از حساب"
@@ -76,11 +96,15 @@ msgstr ""
7696"آیا مطمئن هستید که\n"
7797"می‌خواهید خاموش کنید؟"
7898
79−#: qml/Components/Dialogs.qml:144
99+#: qml/Components/Dialogs.qml:147
80100msgid "Power off"
81101msgstr "خاموش کردن"
82102
83−#: qml/Components/Dialogs.qml:162
103+#: qml/Components/Dialogs.qml:157
104+msgid "Restart"
105+msgstr "شروع مجدّد"
106+
107+#: qml/Components/Dialogs.qml:167
84108msgid "Cancel"
85109msgstr "لغو"
86110
@@ -132,60 +156,44 @@ msgstr ""
132156"هم اکنون در استفاده از ژست های حرکتی مهارت لازم را دارید و می‌توانید استفاده "
133157"از تلفن را آغاز کنید<br><br>برای شروع صفحه را لمس کنید"
134158
135−#: qml/Components/Lockscreen.qml:167
136−msgid "Please wait"
137−msgstr "لطفاً صبر کنید"
138−
139−#: qml/Components/Lockscreen.qml:172
140−msgid "Too many incorrect attempts"
141−msgstr "تلاش‌های ناموفّق زیاد"
142−
143−#: qml/Components/Lockscreen.qml:206
159+#: qml/Components/Lockscreen.qml:218
144160msgid "Emergency Call"
145161msgstr "تماس اضطراری"
146162
147−#: qml/Components/Lockscreen.qml:226
163+#: qml/Components/Lockscreen.qml:250
148164msgid "OK"
149165msgstr "قبول"
150166
151−#: qml/Components/PassphraseLockscreen.qml:61
152−#, qt-format
153−msgid "Hello %1"
154−msgstr "سلام %1"
155−
156−#: qml/Components/PassphraseLockscreen.qml:61
157−msgid "Hello"
158−msgstr "سلام"
159−
160−#: qml/Dash/GenericScopeView.qml:361
167+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
161168msgid "See less"
162169msgstr "کم‌تر ببینید"
163170
164−#: qml/Dash/GenericScopeView.qml:361
171+#: qml/Dash/GenericScopeView.qml:411
165172msgid "See all"
166173msgstr "دیدن همه"
167174
168−#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
175+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
176+#: qml/Panel/SearchIndicator.qml:27
169177msgid "Search"
170178msgstr "جست‌وجو"
171179
172−#: qml/Dash/PageHeader.qml:270
180+#: qml/Dash/PageHeader.qml:268
173181msgid "Settings"
174182msgstr "تنظیمات"
175183
176−#: qml/Dash/PageHeader.qml:279
184+#: qml/Dash/PageHeader.qml:275
177185msgid "Remove from Favorites"
178186msgstr "برداشتن از برگزیده‌ها"
179187
180−#: qml/Dash/PageHeader.qml:279
188+#: qml/Dash/PageHeader.qml:275
181189msgid "Add to Favorites"
182190msgstr "افزودن به برگزیده‌ها"
183191
184−#: qml/Dash/Previews/PreviewActionCombo.qml:34
192+#: qml/Dash/Previews/PreviewActionCombo.qml:35
185193msgid "More..."
186194msgstr "بیش‌تر…"
187195
188−#: qml/Dash/Previews/PreviewActionCombo.qml:34
196+#: qml/Dash/Previews/PreviewActionCombo.qml:35
189197msgid "Less..."
190198msgstr "کم‌تر…"
191199
@@ -201,15 +209,23 @@ msgstr "افزودن یک بازبینی"
201209msgid "Send"
202210msgstr "ارسال"
203211
204−#: qml/Dash/ScopesOverview.qml:201
205−msgid "Manage Dash"
206−msgstr "مدیریت دش"
212+#: qml/Dash/PullToRefreshScopeStyle.qml:55
213+msgid "Pull to refresh…"
214+msgstr ""
207215
208−#: qml/Dash/ScopesOverview.qml:408
216+#: qml/Dash/PullToRefreshScopeStyle.qml:60
217+msgid "Release to refresh…"
218+msgstr ""
219+
220+#: qml/Dash/ScopesOverview.qml:206
221+msgid "Manage Scopes"
222+msgstr "مدیریت حوزه‌ها"
223+
224+#: qml/Dash/ScopesOverview.qml:428
209225msgid "Done"
210226msgstr "انجام شد"
211227
212−#: qml/Dash/ScopesOverview.qml:434
228+#: qml/Dash/ScopesOverview.qml:454
213229msgid "Store"
214230msgstr "فروشگاه"
215231
@@ -222,10 +238,10 @@ msgid "All"
222238msgstr "همه"
223239
224240#: qml/Greeter/Greeter.qml:157
225−msgid "Swipe to unlock"
226−msgstr "برای باز کردن قفل بکشد"
241+msgid "Unlock"
242+msgstr "بازکردن قفل"
227243
228−#: qml/Hud/HudParametrizedActionsPage.qml:132
244+#: qml/Hud/HudParametrizedActionsPage.qml:139
229245msgid "Confirm"
230246msgstr "تأیید"
231247
@@ -245,15 +261,15 @@ msgstr "اکنون صحبت کنید…"
245261msgid "Speaking..."
246262msgstr "در حال صحبت کردن…"
247263
248−#: qml/Notifications/NotificationMenuItemFactory.qml:105
264+#: qml/Notifications/NotificationMenuItemFactory.qml:108
249265msgid "Show password"
250266msgstr "نمایش گذرواژه"
251267
252−#: qml/Notifications/NotificationMenuItemFactory.qml:120
268+#: qml/Notifications/NotificationMenuItemFactory.qml:124
253269msgid "Enter SIM PIN"
254270msgstr "PIN سیم‌کارت را وارد کنید"
255271
256−#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
272+#: qml/Notifications/NotificationMenuItemFactory.qml:125
257273msgid "Sorry, incorrect PIN"
258274msgstr "متأسّفیم، PIN نادرست بود"
259275
@@ -265,27 +281,31 @@ msgstr "برای بازگشت به تماس ضربه بزنید…"
265281msgid "Conference"
266282msgstr "کنفرانس"
267283
268−#: qml/Panel/Indicators/MenuItemFactory.qml:651
284+#: qml/Panel/Indicators/MenuItemFactory.qml:600
285+msgid "Nothing is playing"
286+msgstr "هیچ چیزی در حال پخش نیست"
287+
288+#: qml/Panel/Indicators/MenuItemFactory.qml:748
269289msgid "In queue…"
270290msgstr "در صف…"
271291
272−#: qml/Panel/Indicators/MenuItemFactory.qml:655
292+#: qml/Panel/Indicators/MenuItemFactory.qml:752
273293msgid "Downloading"
274294msgstr "در حال بارگیری"
275295
276−#: qml/Panel/Indicators/MenuItemFactory.qml:657
296+#: qml/Panel/Indicators/MenuItemFactory.qml:754
277297msgid "Paused, tap to resume"
278298msgstr "مکث شد، برای از سر گیری ضربه بزنید"
279299
280−#: qml/Panel/Indicators/MenuItemFactory.qml:659
300+#: qml/Panel/Indicators/MenuItemFactory.qml:756
281301msgid "Canceled"
282302msgstr "لغو شد"
283303
284−#: qml/Panel/Indicators/MenuItemFactory.qml:661
304+#: qml/Panel/Indicators/MenuItemFactory.qml:758
285305msgid "Finished"
286306msgstr "پایان یافت"
287307
288−#: qml/Panel/Indicators/MenuItemFactory.qml:663
308+#: qml/Panel/Indicators/MenuItemFactory.qml:760
289309msgid "Failed, tap to retry"
290310msgstr "شکست خورد، برای تلاش دوباره ضربه بزنید"
291311
@@ -297,45 +317,49 @@ msgstr "باز کردن قفل سیم‌کارت"
297317msgid "Roaming"
298318msgstr "رومینگ"
299319
300−#: qml/Shell.qml:266
301−msgid "Enter your passphrase"
302−msgstr "عبارت‌عبورتان را وارد کنید"
320+#: qml/Shell.qml:340
321+msgid "Enter passphrase"
322+msgstr "عبارت‌عبور را وارد کنید"
303323
304−#: qml/Shell.qml:267
324+#: qml/Shell.qml:341
305325msgid "Sorry, incorrect passphrase"
306326msgstr "متأسّفیم، عبارت‌عبور نادرست بود"
307327
308−#: qml/Shell.qml:282
309−msgid "Enter your passcode"
310−msgstr "رمزعبورتان را وارد کنید"
328+#: qml/Shell.qml:342
329+msgid "Please re-enter"
330+msgstr "لطفاً دوباره وارد کنید"
311331
312−#: qml/Shell.qml:283
332+#: qml/Shell.qml:344
333+msgid "Enter passcode"
334+msgstr "رمزعبور را وارد کنید"
335+
336+#: qml/Shell.qml:345
313337msgid "Sorry, incorrect passcode"
314338msgstr "متأسّفیم، رمزعبور نادرست بود"
315339
316−#: qml/Shell.qml:273
340+#: qml/Shell.qml:348
317341#, qt-format
318−msgid "Enter your %1"
319−msgstr "%1 خود را وارد کنید"
342+msgid "Enter %1"
343+msgstr "%1 را وارد کنید"
320344
321−#: qml/Shell.qml:274
345+#: qml/Shell.qml:349
322346#, qt-format
323347msgid "Sorry, incorrect %1"
324348msgstr "متأسّفیم، %1 نادرست بود"
325349
326−#: qml/Shell.qml:310
350+#: qml/Shell.qml:384
327351msgid "Sorry, incorrect passphrase."
328352msgstr "متأسّفیم، عبارت‌عبور نادرست است."
329353
330−#: qml/Shell.qml:311
354+#: qml/Shell.qml:385
331355msgid "Sorry, incorrect passcode."
332356msgstr "متأسّفیم، رمزعبور نادرست است."
333357
334−#: qml/Shell.qml:312
358+#: qml/Shell.qml:386
335359msgid "This will be your last attempt."
336360msgstr "این آخرین تلاش شما خواهد بود."
337361
338−#: qml/Shell.qml:314
362+#: qml/Shell.qml:388
339363msgid ""
340364"If passphrase is entered incorrectly, your phone will conduct a factory "
341365"reset and all personal data will be deleted."
@@ -343,7 +367,7 @@ msgstr ""
343367"اگر عبارت‌عبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "
344368"اطّلاعات شخصی حذف خواهند شد."
345369
346−#: qml/Shell.qml:315
370+#: qml/Shell.qml:389
347371msgid ""
348372"If passcode is entered incorrectly, your phone will conduct a factory reset "
349373"and all personal data will be deleted."
@@ -351,8 +375,28 @@ msgstr ""
351375"اگر رمزعبور نادرست وارد شود، تلفن شما بازنشانی کارخانه خواهد شد و تمامی "
352376"اطّلاعات شخصی حذف خواهند شد."
353377
354−#~ msgid "Are you sure you would like to turn power off?"
355−#~ msgstr "مطمئنید که می‌خواهید خاموش کنید؟"
378+#, qt-format
379+#~ msgid "Hello %1"
380+#~ msgstr "سلام %1"
381+
382+#~ msgid "Hello"
383+#~ msgstr "سلام"
384+
385+#~ msgid "Swipe to unlock"
386+#~ msgstr "برای باز کردن قفل بکشد"
387+
388+#~ msgid "Please wait"
389+#~ msgstr "لطفاً صبر کنید"
390+
391+#~ msgid "Too many incorrect attempts"
392+#~ msgstr "تلاش‌های ناموفّق زیاد"
393+
394+#, qt-format
395+#~ msgid "Enter your %1"
396+#~ msgstr "%1 خود را وارد کنید"
397+
398+#~ msgid "Enter your passphrase"
399+#~ msgstr "عبارت‌عبورتان را وارد کنید"
356400
357−#~ msgid "Restart"
358−#~ msgstr "شروع مجدّد"
401+#~ msgid "Enter your passcode"
402+#~ msgstr "رمزعبورتان را وارد کنید"
po/fi.po+135−90
@@ -7,78 +7,106 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-26 18:24+0200\n"
11−"PO-Revision-Date: 2014-08-26 18:32+0000\n"
10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
11+"PO-Revision-Date: 2014-10-04 08:00+0000\n"
1212"Last-Translator: Jiri Grönroos <Unknown>\n"
1313"Language-Team: Finnish <fi@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-28 06:30+0000\n"
18−"X-Generator: Launchpad (build 17174)\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
18+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"
19+"X-Generator: Launchpad (build 17196)\n"
1920
20−#: plugins/LightDM/Greeter.cpp:129
21+#: plugins/LightDM/Greeter.cpp:130
2122msgid "Password: "
2223msgstr "Salasana: "
2324
24−#: plugins/Unity/Launcher/launcheritem.cpp:43
25−#: plugins/Unity/Launcher/launcheritem.cpp:73
25+#: plugins/Unity/Launcher/launcheritem.cpp:45
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
2627msgid "Pin shortcut"
2728msgstr "Kiinnitä pikakuvake"
2829
29−#: plugins/Unity/Launcher/launcheritem.cpp:73
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
3031msgid "Unpin shortcut"
3132msgstr "Poista pikakuvakkeen kiinnitys"
3233
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr "Laite on lukittu"
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+"Laite on lukittu liian monen virheellisen tunnuslauseyrityksen jälkeen."
42+
43+#: qml/Components/DelayedLockscreen.qml:63
44+msgid "You have been locked out due to too many failed passcode attempts."
45+msgstr ""
46+"Laite on lukittu liian monen virheellisen suojakoodiyrityksen jälkeen."
47+
48+#: qml/Components/DelayedLockscreen.qml:72
49+#, qt-format
50+msgid "Please wait %1 minute and then try again…"
51+msgid_plural "Please wait %1 minutes and then try again…"
52+msgstr[0] "Odota %1 minuutti ja yritä sitten uudelleen…"
53+msgstr[1] "Odota %1 minuuttia ja yritä sitten uudelleen…"
54+
3355#: qml/Components/Dialogs.qml:70
3456msgid "Log out"
35−msgstr ""
57+msgstr "Kirjaudu ulos"
3658
3759#: qml/Components/Dialogs.qml:71
3860msgid "Are you sure you want to log out?"
39−msgstr ""
61+msgstr "Haluatko varmasti kirjautua ulos?"
4062
4163#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97
4264#: qml/Components/Dialogs.qml:122
4365msgid "No"
44−msgstr ""
66+msgstr "Ei"
4567
4668#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104
4769#: qml/Components/Dialogs.qml:129
4870msgid "Yes"
49−msgstr ""
71+msgstr "Kyllä"
5072
5173#: qml/Components/Dialogs.qml:94
5274msgid "Shut down"
53−msgstr ""
75+msgstr "Sammuta"
5476
5577#: qml/Components/Dialogs.qml:95
5678msgid "Are you sure you want to shut down?"
57−msgstr ""
79+msgstr "Haluatko varmasti sammuttaa laitteen?"
5880
5981#: qml/Components/Dialogs.qml:119
6082msgid "Reboot"
61−msgstr ""
83+msgstr "Käynnistä uudelleen"
6284
6385#: qml/Components/Dialogs.qml:120
6486msgid "Are you sure you want to reboot?"
65−msgstr ""
87+msgstr "Haluatko varmasti käynnistää laitteen uudelleen?"
6688
6789#: qml/Components/Dialogs.qml:144
6890msgid "Power"
69−msgstr ""
91+msgstr "Virran katkaisu"
7092
7193#: qml/Components/Dialogs.qml:145
7294msgid ""
7395"Are you sure you would like\n"
7496"to power off?"
7597msgstr ""
98+"Haluatko varmasti\n"
99+"sammuttaa laitteen?"
76100
77−#: qml/Components/Dialogs.qml:144
101+#: qml/Components/Dialogs.qml:147
78102msgid "Power off"
79103msgstr "Sammuta"
80104
81−#: qml/Components/Dialogs.qml:162
105+#: qml/Components/Dialogs.qml:157
106+msgid "Restart"
107+msgstr "Käynnistä uudelleen"
108+
109+#: qml/Components/Dialogs.qml:167
82110msgid "Cancel"
83111msgstr "Peru"
84112
@@ -130,60 +158,44 @@ msgstr ""
130158"Hallitset nyt reunaeleet, joten voit aloittaa puhelimen "
131159"käytön<br><br>Napauta näyttöä aloittaaksesi"
132160
133−#: qml/Components/Lockscreen.qml:167
134−msgid "Please wait"
135−msgstr "Odota hetki"
136−
137−#: qml/Components/Lockscreen.qml:172
138−msgid "Too many incorrect attempts"
139−msgstr "Liian monta virheellistä yritystä"
140−
141−#: qml/Components/Lockscreen.qml:206
161+#: qml/Components/Lockscreen.qml:218
142162msgid "Emergency Call"
143163msgstr "Hätäpuhelu"
144164
145−#: qml/Components/Lockscreen.qml:226
165+#: qml/Components/Lockscreen.qml:250
146166msgid "OK"
147167msgstr "OK"
148168
149−#: qml/Components/PassphraseLockscreen.qml:61
150−#, qt-format
151−msgid "Hello %1"
152−msgstr "Hei %1!"
153−
154−#: qml/Components/PassphraseLockscreen.qml:61
155−msgid "Hello"
156−msgstr "Hei"
157−
158−#: qml/Dash/GenericScopeView.qml:361
169+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
159170msgid "See less"
160171msgstr "Näytä vähemmän"
161172
162−#: qml/Dash/GenericScopeView.qml:361
173+#: qml/Dash/GenericScopeView.qml:411
163174msgid "See all"
164175msgstr "Näytä kaikki"
165176
166−#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
177+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
178+#: qml/Panel/SearchIndicator.qml:27
167179msgid "Search"
168180msgstr "Hae"
169181
170−#: qml/Dash/PageHeader.qml:270
182+#: qml/Dash/PageHeader.qml:268
171183msgid "Settings"
172−msgstr ""
184+msgstr "Asetukset"
173185
174−#: qml/Dash/PageHeader.qml:279
186+#: qml/Dash/PageHeader.qml:275
175187msgid "Remove from Favorites"
176−msgstr ""
188+msgstr "Poista suosikeista"
177189
178−#: qml/Dash/PageHeader.qml:279
190+#: qml/Dash/PageHeader.qml:275
179191msgid "Add to Favorites"
180−msgstr ""
192+msgstr "Lisää suosikkeihin"
181193
182−#: qml/Dash/Previews/PreviewActionCombo.qml:34
194+#: qml/Dash/Previews/PreviewActionCombo.qml:35
183195msgid "More..."
184196msgstr "Lisää..."
185197
186−#: qml/Dash/Previews/PreviewActionCombo.qml:34
198+#: qml/Dash/Previews/PreviewActionCombo.qml:35
187199msgid "Less..."
188200msgstr "Vähemmän..."
189201
@@ -199,15 +211,23 @@ msgstr "Lisää arvostelu"
199211msgid "Send"
200212msgstr "Lähetä"
201213
202−#: qml/Dash/ScopesOverview.qml:201
203−msgid "Manage Dash"
204−msgstr "Unityn hallinta"
214+#: qml/Dash/PullToRefreshScopeStyle.qml:55
215+msgid "Pull to refresh…"
216+msgstr ""
217+
218+#: qml/Dash/PullToRefreshScopeStyle.qml:60
219+msgid "Release to refresh…"
220+msgstr ""
205221
206−#: qml/Dash/ScopesOverview.qml:408
222+#: qml/Dash/ScopesOverview.qml:206
223+msgid "Manage Scopes"
224+msgstr "Näkymien hallinta"
225+
226+#: qml/Dash/ScopesOverview.qml:428
207227msgid "Done"
208228msgstr "Valmis"
209229
210−#: qml/Dash/ScopesOverview.qml:434
230+#: qml/Dash/ScopesOverview.qml:454
211231msgid "Store"
212232msgstr "Kauppa"
213233
@@ -220,10 +240,10 @@ msgid "All"
220240msgstr "Kaikki"
221241
222242#: qml/Greeter/Greeter.qml:157
223−msgid "Swipe to unlock"
224−msgstr "Avaa pyyhkäisemällä"
243+msgid "Unlock"
244+msgstr "Avaa lukitus"
225245
226−#: qml/Hud/HudParametrizedActionsPage.qml:132
246+#: qml/Hud/HudParametrizedActionsPage.qml:139
227247msgid "Confirm"
228248msgstr "Hyväksy"
229249
@@ -243,15 +263,15 @@ msgstr "Puhu nyt..."
243263msgid "Speaking..."
244264msgstr "Puhutaan..."
245265
246−#: qml/Notifications/NotificationMenuItemFactory.qml:105
266+#: qml/Notifications/NotificationMenuItemFactory.qml:108
247267msgid "Show password"
248268msgstr "Näytä salasana"
249269
250−#: qml/Notifications/NotificationMenuItemFactory.qml:120
270+#: qml/Notifications/NotificationMenuItemFactory.qml:124
251271msgid "Enter SIM PIN"
252272msgstr "Anna SIM-kortin PIN-koodi"
253273
254−#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
274+#: qml/Notifications/NotificationMenuItemFactory.qml:125
255275msgid "Sorry, incorrect PIN"
256276msgstr "Väärä PIN-koodi"
257277
@@ -263,27 +283,31 @@ msgstr "Napauta palataksesi puheluun..."
263283msgid "Conference"
264284msgstr "Ryhmäpuhelu"
265285
266−#: qml/Panel/Indicators/MenuItemFactory.qml:651
286+#: qml/Panel/Indicators/MenuItemFactory.qml:600
287+msgid "Nothing is playing"
288+msgstr "Mitään ei toisteta juuri nyt"
289+
290+#: qml/Panel/Indicators/MenuItemFactory.qml:748
267291msgid "In queue…"
268292msgstr "Jonossa…"
269293
270−#: qml/Panel/Indicators/MenuItemFactory.qml:655
294+#: qml/Panel/Indicators/MenuItemFactory.qml:752
271295msgid "Downloading"
272296msgstr "Ladataan"
273297
274−#: qml/Panel/Indicators/MenuItemFactory.qml:657
298+#: qml/Panel/Indicators/MenuItemFactory.qml:754
275299msgid "Paused, tap to resume"
276300msgstr "Keskeytetty, napauta palauttaaksesi"
277301
278−#: qml/Panel/Indicators/MenuItemFactory.qml:659
302+#: qml/Panel/Indicators/MenuItemFactory.qml:756
279303msgid "Canceled"
280304msgstr "Peruttu"
281305
282−#: qml/Panel/Indicators/MenuItemFactory.qml:661
306+#: qml/Panel/Indicators/MenuItemFactory.qml:758
283307msgid "Finished"
284308msgstr "Valmistunut"
285309
286−#: qml/Panel/Indicators/MenuItemFactory.qml:663
310+#: qml/Panel/Indicators/MenuItemFactory.qml:760
287311msgid "Failed, tap to retry"
288312msgstr "Epäonnistunut, napauta yrittääksesi uudelleen"
289313
@@ -295,45 +319,49 @@ msgstr "Avaa SIM-kortin lukitus"
295319msgid "Roaming"
296320msgstr "Verkkovierailu"
297321
298−#: qml/Shell.qml:266
299−msgid "Enter your passphrase"
322+#: qml/Shell.qml:340
323+msgid "Enter passphrase"
300324msgstr "Anna tunnuslause"
301325
302−#: qml/Shell.qml:267
326+#: qml/Shell.qml:341
303327msgid "Sorry, incorrect passphrase"
304328msgstr "Virheellinen tunnuslause"
305329
306−#: qml/Shell.qml:282
307−msgid "Enter your passcode"
308−msgstr ""
330+#: qml/Shell.qml:342
331+msgid "Please re-enter"
332+msgstr "Anna uudelleen"
333+
334+#: qml/Shell.qml:344
335+msgid "Enter passcode"
336+msgstr "Anna suojakoodi"
309337
310−#: qml/Shell.qml:283
338+#: qml/Shell.qml:345
311339msgid "Sorry, incorrect passcode"
312−msgstr ""
340+msgstr "Väärä suojakoodi"
313341
314−#: qml/Shell.qml:273
342+#: qml/Shell.qml:348
315343#, qt-format
316−msgid "Enter your %1"
344+msgid "Enter %1"
317345msgstr "Anna %1"
318346
319−#: qml/Shell.qml:274
347+#: qml/Shell.qml:349
320348#, qt-format
321349msgid "Sorry, incorrect %1"
322350msgstr "Väärä %1"
323351
324−#: qml/Shell.qml:310
352+#: qml/Shell.qml:384
325353msgid "Sorry, incorrect passphrase."
326354msgstr "Virheellinen tunnuslause."
327355
328−#: qml/Shell.qml:311
356+#: qml/Shell.qml:385
329357msgid "Sorry, incorrect passcode."
330−msgstr "Virheellinen tunnuskoodi."
358+msgstr "Virheellinen suojakoodi."
331359
332−#: qml/Shell.qml:312
360+#: qml/Shell.qml:386
333361msgid "This will be your last attempt."
334362msgstr "Tämä on viimeinen yritys."
335363
336−#: qml/Shell.qml:314
364+#: qml/Shell.qml:388
337365msgid ""
338366"If passphrase is entered incorrectly, your phone will conduct a factory "
339367"reset and all personal data will be deleted."
@@ -341,19 +369,36 @@ msgstr ""
341369"Jos kirjoitat tunnuslauseen virheellisesti, puhelimesi palautetaan "
342370"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."
343371
344−#: qml/Shell.qml:315
372+#: qml/Shell.qml:389
345373msgid ""
346374"If passcode is entered incorrectly, your phone will conduct a factory reset "
347375"and all personal data will be deleted."
348376msgstr ""
349−"Jos kirjoitat tunnuskoodin virheellisesti, puhelimesi palautetaan "
377+"Jos kirjoitat suojakoodin virheellisesti, puhelimesi palautetaan "
350378"tehdastilaan ja kaikki henkilökohtaiset tietosi poistetaan."
351379
352−#~ msgid "Are you sure you would like to turn power off?"
353−#~ msgstr "Haluatko varmasti sammuttaa laitteen?"
380+#~ msgid "Hello"
381+#~ msgstr "Hei"
382+
383+#, qt-format
384+#~ msgid "Hello %1"
385+#~ msgstr "Hei %1!"
386+
387+#~ msgid "Swipe to unlock"
388+#~ msgstr "Avaa pyyhkäisemällä"
389+
390+#~ msgid "Please wait"
391+#~ msgstr "Odota hetki"
392+
393+#~ msgid "Too many incorrect attempts"
394+#~ msgstr "Liian monta virheellistä yritystä"
395+
396+#, qt-format
397+#~ msgid "Enter your %1"
398+#~ msgstr "Anna %1"
354399
355−#~ msgid "Restart"
356−#~ msgstr "Käynnistä uudelleen"
400+#~ msgid "Enter your passphrase"
401+#~ msgstr "Anna tunnuslause"
357402
358−#~ msgid "Enter your PIN"
359−#~ msgstr "Anna PIN-koodi"
403+#~ msgid "Enter your passcode"
404+#~ msgstr "Anna suojakoodi"
po/fo.po+89−65
@@ -7,29 +7,49 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-26 18:24+0200\n"
10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
1111"PO-Revision-Date: 2014-01-14 20:08+0000\n"
1212"Last-Translator: Jógvan Olsen <jeggy@jebster.net>\n"
1313"Language-Team: Faroese <fo@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-28 06:30+0000\n"
18−"X-Generator: Launchpad (build 17174)\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
18+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"
19+"X-Generator: Launchpad (build 17196)\n"
1920
20−#: plugins/LightDM/Greeter.cpp:129
21+#: plugins/LightDM/Greeter.cpp:130
2122msgid "Password: "
2223msgstr ""
2324
24−#: plugins/Unity/Launcher/launcheritem.cpp:43
25−#: plugins/Unity/Launcher/launcheritem.cpp:73
25+#: plugins/Unity/Launcher/launcheritem.cpp:45
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
2627msgid "Pin shortcut"
2728msgstr ""
2829
29−#: plugins/Unity/Launcher/launcheritem.cpp:73
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
3031msgid "Unpin shortcut"
3132msgstr ""
3233
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
3353#: qml/Components/Dialogs.qml:70
3454msgid "Log out"
3555msgstr ""
@@ -74,11 +94,15 @@ msgid ""
7494"to power off?"
7595msgstr ""
7696
77−#: qml/Components/Dialogs.qml:144
97+#: qml/Components/Dialogs.qml:147
7898msgid "Power off"
7999msgstr ""
80100
81−#: qml/Components/Dialogs.qml:162
101+#: qml/Components/Dialogs.qml:157
102+msgid "Restart"
103+msgstr ""
104+
105+#: qml/Components/Dialogs.qml:167
82106msgid "Cancel"
83107msgstr ""
84108
@@ -128,60 +152,44 @@ msgid ""
128152"phone<br><br>Tap on the screen to start"
129153msgstr ""
130154
131−#: qml/Components/Lockscreen.qml:167
132−msgid "Please wait"
133−msgstr ""
134−
135−#: qml/Components/Lockscreen.qml:172
136−msgid "Too many incorrect attempts"
137−msgstr ""
138−
139−#: qml/Components/Lockscreen.qml:206
155+#: qml/Components/Lockscreen.qml:218
140156msgid "Emergency Call"
141157msgstr ""
142158
143−#: qml/Components/Lockscreen.qml:226
159+#: qml/Components/Lockscreen.qml:250
144160msgid "OK"
145161msgstr ""
146162
147−#: qml/Components/PassphraseLockscreen.qml:61
148−#, qt-format
149−msgid "Hello %1"
150−msgstr ""
151−
152−#: qml/Components/PassphraseLockscreen.qml:61
153−msgid "Hello"
154−msgstr ""
155−
156−#: qml/Dash/GenericScopeView.qml:361
163+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
157164msgid "See less"
158165msgstr ""
159166
160−#: qml/Dash/GenericScopeView.qml:361
167+#: qml/Dash/GenericScopeView.qml:411
161168msgid "See all"
162169msgstr ""
163170
164−#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
171+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
172+#: qml/Panel/SearchIndicator.qml:27
165173msgid "Search"
166174msgstr "Leita"
167175
168−#: qml/Dash/PageHeader.qml:270
176+#: qml/Dash/PageHeader.qml:268
169177msgid "Settings"
170178msgstr ""
171179
172−#: qml/Dash/PageHeader.qml:279
180+#: qml/Dash/PageHeader.qml:275
173181msgid "Remove from Favorites"
174182msgstr ""
175183
176−#: qml/Dash/PageHeader.qml:279
184+#: qml/Dash/PageHeader.qml:275
177185msgid "Add to Favorites"
178186msgstr ""
179187
180−#: qml/Dash/Previews/PreviewActionCombo.qml:34
188+#: qml/Dash/Previews/PreviewActionCombo.qml:35
181189msgid "More..."
182190msgstr ""
183191
184−#: qml/Dash/Previews/PreviewActionCombo.qml:34
192+#: qml/Dash/Previews/PreviewActionCombo.qml:35
185193msgid "Less..."
186194msgstr ""
187195
@@ -197,15 +205,23 @@ msgstr ""
197205msgid "Send"
198206msgstr ""
199207
200−#: qml/Dash/ScopesOverview.qml:201
201−msgid "Manage Dash"
208+#: qml/Dash/PullToRefreshScopeStyle.qml:55
209+msgid "Pull to refresh…"
210+msgstr ""
211+
212+#: qml/Dash/PullToRefreshScopeStyle.qml:60
213+msgid "Release to refresh…"
214+msgstr ""
215+
216+#: qml/Dash/ScopesOverview.qml:206
217+msgid "Manage Scopes"
202218msgstr ""
203219
204−#: qml/Dash/ScopesOverview.qml:408
220+#: qml/Dash/ScopesOverview.qml:428
205221msgid "Done"
206222msgstr ""
207223
208−#: qml/Dash/ScopesOverview.qml:434
224+#: qml/Dash/ScopesOverview.qml:454
209225msgid "Store"
210226msgstr ""
211227
@@ -218,10 +234,10 @@ msgid "All"
218234msgstr ""
219235
220236#: qml/Greeter/Greeter.qml:157
221−msgid "Swipe to unlock"
237+msgid "Unlock"
222238msgstr ""
223239
224−#: qml/Hud/HudParametrizedActionsPage.qml:132
240+#: qml/Hud/HudParametrizedActionsPage.qml:139
225241msgid "Confirm"
226242msgstr "Vátta"
227243
@@ -241,15 +257,15 @@ msgstr "Snakka nú..."
241257msgid "Speaking..."
242258msgstr "Snakkar..."
243259
244−#: qml/Notifications/NotificationMenuItemFactory.qml:105
260+#: qml/Notifications/NotificationMenuItemFactory.qml:108
245261msgid "Show password"
246262msgstr ""
247263
248−#: qml/Notifications/NotificationMenuItemFactory.qml:120
264+#: qml/Notifications/NotificationMenuItemFactory.qml:124
249265msgid "Enter SIM PIN"
250266msgstr ""
251267
252−#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
268+#: qml/Notifications/NotificationMenuItemFactory.qml:125
253269msgid "Sorry, incorrect PIN"
254270msgstr ""
255271
@@ -261,27 +277,31 @@ msgstr ""
261277msgid "Conference"
262278msgstr ""
263279
264−#: qml/Panel/Indicators/MenuItemFactory.qml:651
280+#: qml/Panel/Indicators/MenuItemFactory.qml:600
281+msgid "Nothing is playing"
282+msgstr ""
283+
284+#: qml/Panel/Indicators/MenuItemFactory.qml:748
265285msgid "In queue…"
266286msgstr ""
267287
268−#: qml/Panel/Indicators/MenuItemFactory.qml:655
288+#: qml/Panel/Indicators/MenuItemFactory.qml:752
269289msgid "Downloading"
270290msgstr ""
271291
272−#: qml/Panel/Indicators/MenuItemFactory.qml:657
292+#: qml/Panel/Indicators/MenuItemFactory.qml:754
273293msgid "Paused, tap to resume"
274294msgstr ""
275295
276−#: qml/Panel/Indicators/MenuItemFactory.qml:659
296+#: qml/Panel/Indicators/MenuItemFactory.qml:756
277297msgid "Canceled"
278298msgstr ""
279299
280−#: qml/Panel/Indicators/MenuItemFactory.qml:661
300+#: qml/Panel/Indicators/MenuItemFactory.qml:758
281301msgid "Finished"
282302msgstr ""
283303
284−#: qml/Panel/Indicators/MenuItemFactory.qml:663
304+#: qml/Panel/Indicators/MenuItemFactory.qml:760
285305msgid "Failed, tap to retry"
286306msgstr ""
287307
@@ -293,51 +313,55 @@ msgstr ""
293313msgid "Roaming"
294314msgstr ""
295315
296−#: qml/Shell.qml:266
297−msgid "Enter your passphrase"
316+#: qml/Shell.qml:340
317+msgid "Enter passphrase"
298318msgstr ""
299319
300−#: qml/Shell.qml:267
320+#: qml/Shell.qml:341
301321msgid "Sorry, incorrect passphrase"
302322msgstr ""
303323
304−#: qml/Shell.qml:282
305−msgid "Enter your passcode"
324+#: qml/Shell.qml:342
325+msgid "Please re-enter"
326+msgstr ""
327+
328+#: qml/Shell.qml:344
329+msgid "Enter passcode"
306330msgstr ""
307331
308−#: qml/Shell.qml:283
332+#: qml/Shell.qml:345
309333msgid "Sorry, incorrect passcode"
310334msgstr ""
311335
312−#: qml/Shell.qml:273
336+#: qml/Shell.qml:348
313337#, qt-format
314−msgid "Enter your %1"
338+msgid "Enter %1"
315339msgstr ""
316340
317−#: qml/Shell.qml:274
341+#: qml/Shell.qml:349
318342#, qt-format
319343msgid "Sorry, incorrect %1"
320344msgstr ""
321345
322−#: qml/Shell.qml:310
346+#: qml/Shell.qml:384
323347msgid "Sorry, incorrect passphrase."
324348msgstr ""
325349
326−#: qml/Shell.qml:311
350+#: qml/Shell.qml:385
327351msgid "Sorry, incorrect passcode."
328352msgstr ""
329353
330−#: qml/Shell.qml:312
354+#: qml/Shell.qml:386
331355msgid "This will be your last attempt."
332356msgstr ""
333357
334−#: qml/Shell.qml:314
358+#: qml/Shell.qml:388
335359msgid ""
336360"If passphrase is entered incorrectly, your phone will conduct a factory "
337361"reset and all personal data will be deleted."
338362msgstr ""
339363
340−#: qml/Shell.qml:315
364+#: qml/Shell.qml:389
341365msgid ""
342366"If passcode is entered incorrectly, your phone will conduct a factory reset "
343367"and all personal data will be deleted."
po/fr.po+139−92
@@ -7,78 +7,108 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-26 18:24+0200\n"
11−"PO-Revision-Date: 2014-08-27 17:24+0000\n"
10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
11+"PO-Revision-Date: 2014-10-06 19:06+0000\n"
1212"Last-Translator: Jean Marc <Unknown>\n"
1313"Language-Team: French <fr@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-28 06:30+0000\n"
18−"X-Generator: Launchpad (build 17174)\n"
17+"Plural-Forms: nplurals=2; plural=n > 1;\n"
18+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"
19+"X-Generator: Launchpad (build 17196)\n"
1920
20−#: plugins/LightDM/Greeter.cpp:129
21+#: plugins/LightDM/Greeter.cpp:130
2122msgid "Password: "
2223msgstr "Mot de passe : "
2324
24−#: plugins/Unity/Launcher/launcheritem.cpp:43
25−#: plugins/Unity/Launcher/launcheritem.cpp:73
25+#: plugins/Unity/Launcher/launcheritem.cpp:45
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
2627msgid "Pin shortcut"
2728msgstr "Épingler le raccourci"
2829
29−#: plugins/Unity/Launcher/launcheritem.cpp:73
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
3031msgid "Unpin shortcut"
3132msgstr "Détacher le raccourci"
3233
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr "Périphérique verrouillé"
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+"Vous avez été bloqué suite à un trop grand nombre de tentatives de saisie "
42+"d'une phrase de passe erronée."
43+
44+#: qml/Components/DelayedLockscreen.qml:63
45+msgid "You have been locked out due to too many failed passcode attempts."
46+msgstr ""
47+"Vous avez été bloqué suite à un trop grand nombre de tentatives de saisie "
48+"d'un mot de passe erroné."
49+
50+#: qml/Components/DelayedLockscreen.qml:72
51+#, qt-format
52+msgid "Please wait %1 minute and then try again…"
53+msgid_plural "Please wait %1 minutes and then try again…"
54+msgstr[0] "Veuillez patienter %1 minute et réessayer..."
55+msgstr[1] "Veuillez patienter %1 minutes et réessayer..."
56+
3357#: qml/Components/Dialogs.qml:70
3458msgid "Log out"
35−msgstr ""
59+msgstr "Se déconnecter"
3660
3761#: qml/Components/Dialogs.qml:71
3862msgid "Are you sure you want to log out?"
39−msgstr ""
63+msgstr "Êtes-vous sûr de vouloir vous déconnecter ?"
4064
4165#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97
4266#: qml/Components/Dialogs.qml:122
4367msgid "No"
44−msgstr ""
68+msgstr "Non"
4569
4670#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104
4771#: qml/Components/Dialogs.qml:129
4872msgid "Yes"
49−msgstr ""
73+msgstr "Oui"
5074
5175#: qml/Components/Dialogs.qml:94
5276msgid "Shut down"
53−msgstr ""
77+msgstr "Éteindre"
5478
5579#: qml/Components/Dialogs.qml:95
5680msgid "Are you sure you want to shut down?"
57−msgstr ""
81+msgstr "Êtes-vous sûr de vouloir éteindre ?"
5882
5983#: qml/Components/Dialogs.qml:119
6084msgid "Reboot"
61−msgstr ""
85+msgstr "Redémarrer"
6286
6387#: qml/Components/Dialogs.qml:120
6488msgid "Are you sure you want to reboot?"
65−msgstr ""
89+msgstr "Êtes-vous sûr de vouloir redémarrer ?"
6690
6791#: qml/Components/Dialogs.qml:144
6892msgid "Power"
69−msgstr ""
93+msgstr "Alimentation"
7094
7195#: qml/Components/Dialogs.qml:145
7296msgid ""
7397"Are you sure you would like\n"
7498"to power off?"
7599msgstr ""
100+"Êtes-vous sûr de vouloir\n"
101+"couper l'alimentation ?"
76102
77−#: qml/Components/Dialogs.qml:144
103+#: qml/Components/Dialogs.qml:147
78104msgid "Power off"
79105msgstr "Éteindre"
80106
81−#: qml/Components/Dialogs.qml:162
107+#: qml/Components/Dialogs.qml:157
108+msgid "Restart"
109+msgstr "Redémarrer"
110+
111+#: qml/Components/Dialogs.qml:167
82112msgid "Cancel"
83113msgstr "Annuler"
84114
@@ -137,60 +167,44 @@ msgstr ""
137167"Vous maîtrisez maintenant les différents gestes et pouvez commencer à "
138168"utiliser le téléphone<br><br>Appuyez sur l'écran pour commencer"
139169
140−#: qml/Components/Lockscreen.qml:167
141−msgid "Please wait"
142−msgstr "Veuillez patienter"
143−
144−#: qml/Components/Lockscreen.qml:172
145−msgid "Too many incorrect attempts"
146−msgstr "Trop de tentatives incorrectes"
147−
148−#: qml/Components/Lockscreen.qml:206
170+#: qml/Components/Lockscreen.qml:218
149171msgid "Emergency Call"
150172msgstr "Appel d'urgence"
151173
152−#: qml/Components/Lockscreen.qml:226
174+#: qml/Components/Lockscreen.qml:250
153175msgid "OK"
154176msgstr "OK"
155177
156−#: qml/Components/PassphraseLockscreen.qml:61
157−#, qt-format
158−msgid "Hello %1"
159−msgstr "Bonjour %1"
160−
161−#: qml/Components/PassphraseLockscreen.qml:61
162−msgid "Hello"
163−msgstr "Bonjour"
164−
165−#: qml/Dash/GenericScopeView.qml:361
178+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
166179msgid "See less"
167180msgstr "Voir moins"
168181
169−#: qml/Dash/GenericScopeView.qml:361
182+#: qml/Dash/GenericScopeView.qml:411
170183msgid "See all"
171184msgstr "Tout voir"
172185
173−#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
186+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
187+#: qml/Panel/SearchIndicator.qml:27
174188msgid "Search"
175189msgstr "Rechercher"
176190
177−#: qml/Dash/PageHeader.qml:270
191+#: qml/Dash/PageHeader.qml:268
178192msgid "Settings"
179−msgstr ""
193+msgstr "Paramètres"
180194
181−#: qml/Dash/PageHeader.qml:279
195+#: qml/Dash/PageHeader.qml:275
182196msgid "Remove from Favorites"
183−msgstr ""
197+msgstr "Retirer des favoris"
184198
185−#: qml/Dash/PageHeader.qml:279
199+#: qml/Dash/PageHeader.qml:275
186200msgid "Add to Favorites"
187−msgstr ""
201+msgstr "Ajouter aux favoris"
188202
189−#: qml/Dash/Previews/PreviewActionCombo.qml:34
203+#: qml/Dash/Previews/PreviewActionCombo.qml:35
190204msgid "More..."
191205msgstr "Plus..."
192206
193−#: qml/Dash/Previews/PreviewActionCombo.qml:34
207+#: qml/Dash/Previews/PreviewActionCombo.qml:35
194208msgid "Less..."
195209msgstr "Moins..."
196210
@@ -206,17 +220,25 @@ msgstr "Ajouter un avis"
206220msgid "Send"
207221msgstr "Envoyer"
208222
209−#: qml/Dash/ScopesOverview.qml:201
210−msgid "Manage Dash"
211−msgstr "Gérer le tableau de bord"
223+#: qml/Dash/PullToRefreshScopeStyle.qml:55
224+msgid "Pull to refresh…"
225+msgstr ""
212226
213−#: qml/Dash/ScopesOverview.qml:408
227+#: qml/Dash/PullToRefreshScopeStyle.qml:60
228+msgid "Release to refresh…"
229+msgstr ""
230+
231+#: qml/Dash/ScopesOverview.qml:206
232+msgid "Manage Scopes"
233+msgstr "Gérer les moteurs de recherche"
234+
235+#: qml/Dash/ScopesOverview.qml:428
214236msgid "Done"
215237msgstr "Terminé"
216238
217−#: qml/Dash/ScopesOverview.qml:434
239+#: qml/Dash/ScopesOverview.qml:454
218240msgid "Store"
219−msgstr ""
241+msgstr "Logithèque"
220242
221243#: qml/Dash/ScopesOverviewTab.qml:36
222244msgid "Favorites"
@@ -227,10 +249,10 @@ msgid "All"
227249msgstr "Toutes"
228250
229251#: qml/Greeter/Greeter.qml:157
230−msgid "Swipe to unlock"
231−msgstr "Faites glisser pour déverrouiller"
252+msgid "Unlock"
253+msgstr "Déverrouiller"
232254
233−#: qml/Hud/HudParametrizedActionsPage.qml:132
255+#: qml/Hud/HudParametrizedActionsPage.qml:139
234256msgid "Confirm"
235257msgstr "Confirmez"
236258
@@ -250,15 +272,15 @@ msgstr "Parlez maintenant…"
250272msgid "Speaking..."
251273msgstr "En cours d'écoute..."
252274
253−#: qml/Notifications/NotificationMenuItemFactory.qml:105
275+#: qml/Notifications/NotificationMenuItemFactory.qml:108
254276msgid "Show password"
255277msgstr "Afficher le mot de passe"
256278
257−#: qml/Notifications/NotificationMenuItemFactory.qml:120
279+#: qml/Notifications/NotificationMenuItemFactory.qml:124
258280msgid "Enter SIM PIN"
259281msgstr "Entrez le code PIN de la SIM"
260282
261−#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
283+#: qml/Notifications/NotificationMenuItemFactory.qml:125
262284msgid "Sorry, incorrect PIN"
263285msgstr "Désolé, code PIN incorrect"
264286
@@ -270,27 +292,31 @@ msgstr "Appuyez pour revenir à l'appel…"
270292msgid "Conference"
271293msgstr "Conférence"
272294
273−#: qml/Panel/Indicators/MenuItemFactory.qml:651
295+#: qml/Panel/Indicators/MenuItemFactory.qml:600
296+msgid "Nothing is playing"
297+msgstr "Rien n'est en cours de lecture"
298+
299+#: qml/Panel/Indicators/MenuItemFactory.qml:748
274300msgid "In queue…"
275301msgstr "Dans la file d'attente..."
276302
277−#: qml/Panel/Indicators/MenuItemFactory.qml:655
303+#: qml/Panel/Indicators/MenuItemFactory.qml:752
278304msgid "Downloading"
279305msgstr "Téléchargement en cours"
280306
281−#: qml/Panel/Indicators/MenuItemFactory.qml:657
307+#: qml/Panel/Indicators/MenuItemFactory.qml:754
282308msgid "Paused, tap to resume"
283309msgstr "En pause, appuyez pour reprendre"
284310
285−#: qml/Panel/Indicators/MenuItemFactory.qml:659
311+#: qml/Panel/Indicators/MenuItemFactory.qml:756
286312msgid "Canceled"
287313msgstr "Annulé"
288314
289−#: qml/Panel/Indicators/MenuItemFactory.qml:661
315+#: qml/Panel/Indicators/MenuItemFactory.qml:758
290316msgid "Finished"
291317msgstr "Terminé"
292318
293−#: qml/Panel/Indicators/MenuItemFactory.qml:663
319+#: qml/Panel/Indicators/MenuItemFactory.qml:760
294320msgid "Failed, tap to retry"
295321msgstr "Échec, appuyez pour réessayer"
296322
@@ -302,45 +328,49 @@ msgstr "Déverrouiller la carte SIM"
302328msgid "Roaming"
303329msgstr "Roaming"
304330
305−#: qml/Shell.qml:266
306−msgid "Enter your passphrase"
307−msgstr ""
331+#: qml/Shell.qml:340
332+msgid "Enter passphrase"
333+msgstr "Saisissez la phrase de passe"
308334
309−#: qml/Shell.qml:267
335+#: qml/Shell.qml:341
310336msgid "Sorry, incorrect passphrase"
311−msgstr ""
337+msgstr "Désolé, phrase secrète incorrecte"
312338
313−#: qml/Shell.qml:282
314−msgid "Enter your passcode"
315−msgstr ""
339+#: qml/Shell.qml:342
340+msgid "Please re-enter"
341+msgstr "Veuillez ressaisir"
342+
343+#: qml/Shell.qml:344
344+msgid "Enter passcode"
345+msgstr "Saisissez le mot de passe"
316346
317−#: qml/Shell.qml:283
347+#: qml/Shell.qml:345
318348msgid "Sorry, incorrect passcode"
319−msgstr ""
349+msgstr "Désolé, code incorrect"
320350
321−#: qml/Shell.qml:273
351+#: qml/Shell.qml:348
322352#, qt-format
323−msgid "Enter your %1"
324−msgstr "Saisissez votre %1"
353+msgid "Enter %1"
354+msgstr "Saisissez %1"
325355
326−#: qml/Shell.qml:274
356+#: qml/Shell.qml:349
327357#, qt-format
328358msgid "Sorry, incorrect %1"
329359msgstr "Désolé, %1 incorrect"
330360
331−#: qml/Shell.qml:310
361+#: qml/Shell.qml:384
332362msgid "Sorry, incorrect passphrase."
333363msgstr "Désolé, phrase secrète incorrecte."
334364
335−#: qml/Shell.qml:311
365+#: qml/Shell.qml:385
336366msgid "Sorry, incorrect passcode."
337367msgstr "Désolé, code incorrect."
338368
339−#: qml/Shell.qml:312
369+#: qml/Shell.qml:386
340370msgid "This will be your last attempt."
341371msgstr "Ceci sera votre dernière tentative."
342372
343−#: qml/Shell.qml:314
373+#: qml/Shell.qml:388
344374msgid ""
345375"If passphrase is entered incorrectly, your phone will conduct a factory "
346376"reset and all personal data will be deleted."
@@ -349,7 +379,7 @@ msgstr ""
349379"effectuera une réinitialisation aux paramètres d'usine et toutes les données "
350380"personnelles seront supprimées."
351381
352−#: qml/Shell.qml:315
382+#: qml/Shell.qml:389
353383msgid ""
354384"If passcode is entered incorrectly, your phone will conduct a factory reset "
355385"and all personal data will be deleted."
@@ -358,11 +388,28 @@ msgstr ""
358388"réinitialisation aux paramètres d'usine et toutes les données personnelles "
359389"seront supprimées."
360390
361−#~ msgid "Restart"
362−#~ msgstr "Redémarrer"
391+#~ msgid "Hello"
392+#~ msgstr "Bonjour"
393+
394+#, qt-format
395+#~ msgid "Hello %1"
396+#~ msgstr "Bonjour %1"
397+
398+#~ msgid "Swipe to unlock"
399+#~ msgstr "Faites glisser pour déverrouiller"
400+
401+#~ msgid "Please wait"
402+#~ msgstr "Veuillez patienter"
403+
404+#~ msgid "Too many incorrect attempts"
405+#~ msgstr "Trop de tentatives incorrectes"
406+
407+#, qt-format
408+#~ msgid "Enter your %1"
409+#~ msgstr "Saisissez votre %1"
363410
364−#~ msgid "Are you sure you would like to turn power off?"
365−#~ msgstr "Êtes-vous sûr de vouloir éteindre ?"
411+#~ msgid "Enter your passphrase"
412+#~ msgstr "Entrez votre phrase secrète"
366413
367−#~ msgid "Enter your PIN"
368−#~ msgstr "Entrez votre code PIN"
414+#~ msgid "Enter your passcode"
415+#~ msgstr "Entrez votre code"
po/gd.po+157−98
@@ -7,79 +7,112 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-26 18:24+0200\n"
11−"PO-Revision-Date: 2014-08-13 00:21+0000\n"
12−"Last-Translator: Akerbeltz <fios@akerbeltz.org>\n"
13−"Language-Team: Fòram na Gàidhlig http://www.foramnagaidhlig.net\n"
10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
11+"PO-Revision-Date: 2014-10-03 19:54+0000\n"
12+"Last-Translator: GunChleoc <Unknown>\n"
13+"Language-Team: Fòram na Gàidhlig\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-28 06:30+0000\n"
18−"X-Generator: Launchpad (build 17174)\n"
17+"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : "
18+"(n > 2 && n < 20) ? 2 : 3;\n"
19+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"
20+"X-Generator: Launchpad (build 17196)\n"
1921"Language: gd\n"
2022
21−#: plugins/LightDM/Greeter.cpp:129
23+#: plugins/LightDM/Greeter.cpp:130
2224msgid "Password: "
23−msgstr ""
25+msgstr "Facal-faire: "
2426
25−#: plugins/Unity/Launcher/launcheritem.cpp:43
26−#: plugins/Unity/Launcher/launcheritem.cpp:73
27+#: plugins/Unity/Launcher/launcheritem.cpp:45
28+#: plugins/Unity/Launcher/launcheritem.cpp:91
2729msgid "Pin shortcut"
2830msgstr "Prìnich ath-ghoirid"
2931
30−#: plugins/Unity/Launcher/launcheritem.cpp:73
32+#: plugins/Unity/Launcher/launcheritem.cpp:91
3133msgid "Unpin shortcut"
3234msgstr "Neo-phrìnich an ath-ghoirid"
3335
36+#: qml/Components/DelayedLockscreen.qml:47
37+msgid "Device Locked"
38+msgstr "Tha glas air an uidheam"
39+
40+#: qml/Components/DelayedLockscreen.qml:62
41+msgid "You have been locked out due to too many failed passphrase attempts."
42+msgstr ""
43+"Chaidh do glasadh a-mach às an uidheam on a chuir thu abairt-fhaire chearr a-"
44+"steach cus tursan."
45+
46+#: qml/Components/DelayedLockscreen.qml:63
47+msgid "You have been locked out due to too many failed passcode attempts."
48+msgstr ""
49+"Chaidh do glasadh a-mach às an uidheam on a chuir thu còd-faire cearr a-"
50+"steach cus tursan."
51+
52+#: qml/Components/DelayedLockscreen.qml:72
53+#, qt-format
54+msgid "Please wait %1 minute and then try again…"
55+msgid_plural "Please wait %1 minutes and then try again…"
56+msgstr[0] "Fuirich ort %1 diog 's feuch ris a-rithist an uairsin…"
57+msgstr[1] "Fuirich ort %1 dhiog 's feuch ris a-rithist an uairsin…"
58+msgstr[2] "Fuirich ort %1 diogan 's feuch ris a-rithist an uairsin…"
59+msgstr[3] "Fuirich ort %1 diog 's feuch ris a-rithist an uairsin…"
60+
3461#: qml/Components/Dialogs.qml:70
3562msgid "Log out"
36−msgstr ""
63+msgstr "Clàraich a-mach"
3764
3865#: qml/Components/Dialogs.qml:71
3966msgid "Are you sure you want to log out?"
40−msgstr ""
67+msgstr "A bheil thu cinnteach gu bheil thu airson clàradh a-mach?"
4168
4269#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97
4370#: qml/Components/Dialogs.qml:122
4471msgid "No"
45−msgstr ""
72+msgstr "Chan eil"
4673
4774#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104
4875#: qml/Components/Dialogs.qml:129
4976msgid "Yes"
50−msgstr ""
77+msgstr "Tha"
5178
5279#: qml/Components/Dialogs.qml:94
5380msgid "Shut down"
54−msgstr ""
81+msgstr "Dùin sìos"
5582
5683#: qml/Components/Dialogs.qml:95
5784msgid "Are you sure you want to shut down?"
58−msgstr ""
85+msgstr "A bheil thu cinnteach gu bheil thu airson a dhùnadh sìos?"
5986
6087#: qml/Components/Dialogs.qml:119
6188msgid "Reboot"
62−msgstr ""
89+msgstr "Ath-thòisich an siostam"
6390
6491#: qml/Components/Dialogs.qml:120
6592msgid "Are you sure you want to reboot?"
66−msgstr ""
93+msgstr "A bheil thu cinnteach gu bheil thu airson tòiseachadh às ùr?"
6794
6895#: qml/Components/Dialogs.qml:144
6996msgid "Power"
70−msgstr ""
97+msgstr "Cumhachd"
7198
7299#: qml/Components/Dialogs.qml:145
73100msgid ""
74101"Are you sure you would like\n"
75102"to power off?"
76103msgstr ""
104+"A bheil thu cinnteach gu bheil thu\n"
105+"airson a' chumhachd a chur dheth?"
77106
78−#: qml/Components/Dialogs.qml:144
107+#: qml/Components/Dialogs.qml:147
79108msgid "Power off"
80109msgstr "Cuir a' chumhachd dheth"
81110
82−#: qml/Components/Dialogs.qml:162
111+#: qml/Components/Dialogs.qml:157
112+msgid "Restart"
113+msgstr "Ath-thòisich"
114+
115+#: qml/Components/Dialogs.qml:167
83116msgid "Cancel"
84117msgstr "Sguir dheth"
85118
@@ -137,60 +170,44 @@ msgstr ""
137170"Fhuair thu air na gluasadan oire ceart a dhèanamh a-nis agus is urrainn dhut "
138171"am fòn a chleachdadh<br><br>Thoir gnogag air an sgrìn airson tòiseachadh"
139172
140−#: qml/Components/Lockscreen.qml:167
141−msgid "Please wait"
142−msgstr ""
143−
144−#: qml/Components/Lockscreen.qml:172
145−msgid "Too many incorrect attempts"
146−msgstr ""
147−
148−#: qml/Components/Lockscreen.qml:206
173+#: qml/Components/Lockscreen.qml:218
149174msgid "Emergency Call"
150175msgstr "Gairm èiginn"
151176
152−#: qml/Components/Lockscreen.qml:226
177+#: qml/Components/Lockscreen.qml:250
153178msgid "OK"
154179msgstr "Ceart ma-thà"
155180
156−#: qml/Components/PassphraseLockscreen.qml:61
157−#, qt-format
158−msgid "Hello %1"
159−msgstr "Shin thu, %1"
160−
161−#: qml/Components/PassphraseLockscreen.qml:61
162−msgid "Hello"
163−msgstr "Shin thu"
164−
165−#: qml/Dash/GenericScopeView.qml:361
181+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
166182msgid "See less"
167183msgstr "Seall nas lugha"
168184
169−#: qml/Dash/GenericScopeView.qml:361
185+#: qml/Dash/GenericScopeView.qml:411
170186msgid "See all"
171187msgstr "Seall na h-uile"
172188
173−#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
189+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
190+#: qml/Panel/SearchIndicator.qml:27
174191msgid "Search"
175192msgstr "Lorg"
176193
177−#: qml/Dash/PageHeader.qml:270
194+#: qml/Dash/PageHeader.qml:268
178195msgid "Settings"
179−msgstr ""
196+msgstr "Roghainnean"
180197
181−#: qml/Dash/PageHeader.qml:279
198+#: qml/Dash/PageHeader.qml:275
182199msgid "Remove from Favorites"
183−msgstr ""
200+msgstr "Thoir air falbh o na h-annsachdan"
184201
185−#: qml/Dash/PageHeader.qml:279
202+#: qml/Dash/PageHeader.qml:275
186203msgid "Add to Favorites"
187−msgstr ""
204+msgstr "Cuir ris na h-annsachdan"
188205
189−#: qml/Dash/Previews/PreviewActionCombo.qml:34
206+#: qml/Dash/Previews/PreviewActionCombo.qml:35
190207msgid "More..."
191208msgstr "Barrachd..."
192209
193−#: qml/Dash/Previews/PreviewActionCombo.qml:34
210+#: qml/Dash/Previews/PreviewActionCombo.qml:35
194211msgid "Less..."
195212msgstr "Nas lugha..."
196213
@@ -206,15 +223,23 @@ msgstr "Cuir lèirmheas ris"
206223msgid "Send"
207224msgstr "Cuir"
208225
209−#: qml/Dash/ScopesOverview.qml:201
210−msgid "Manage Dash"
211−msgstr "Stiùirich an deas-bhòrd"
226+#: qml/Dash/PullToRefreshScopeStyle.qml:55
227+msgid "Pull to refresh…"
228+msgstr ""
212229
213−#: qml/Dash/ScopesOverview.qml:408
230+#: qml/Dash/PullToRefreshScopeStyle.qml:60
231+msgid "Release to refresh…"
232+msgstr ""
233+
234+#: qml/Dash/ScopesOverview.qml:206
235+msgid "Manage Scopes"
236+msgstr "Stiùirich na sgòpaichean"
237+
238+#: qml/Dash/ScopesOverview.qml:428
214239msgid "Done"
215240msgstr "Deiseil"
216241
217−#: qml/Dash/ScopesOverview.qml:434
242+#: qml/Dash/ScopesOverview.qml:454
218243msgid "Store"
219244msgstr "Am bùth"
220245
@@ -227,10 +252,10 @@ msgid "All"
227252msgstr "Na h-uile"
228253
229254#: qml/Greeter/Greeter.qml:157
230−msgid "Swipe to unlock"
231−msgstr "Dèan grad-shlaighdeadh gus a' ghlas a thoirt dheth"
255+msgid "Unlock"
256+msgstr "Thoir a' ghlas dheth"
232257
233−#: qml/Hud/HudParametrizedActionsPage.qml:132
258+#: qml/Hud/HudParametrizedActionsPage.qml:139
234259msgid "Confirm"
235260msgstr "Dearbhaich"
236261
@@ -250,17 +275,17 @@ msgstr "Can rud a-nis..."
250275msgid "Speaking..."
251276msgstr "A' bruidhinn..."
252277
253−#: qml/Notifications/NotificationMenuItemFactory.qml:105
278+#: qml/Notifications/NotificationMenuItemFactory.qml:108
254279msgid "Show password"
255280msgstr "Seall am facal-faire"
256281
257−#: qml/Notifications/NotificationMenuItemFactory.qml:120
282+#: qml/Notifications/NotificationMenuItemFactory.qml:124
258283msgid "Enter SIM PIN"
259−msgstr ""
284+msgstr "Cuir a-steach PIN an t-SIM"
260285
261−#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
286+#: qml/Notifications/NotificationMenuItemFactory.qml:125
262287msgid "Sorry, incorrect PIN"
263−msgstr ""
288+msgstr "Duilich ach tha a' PIN cearr"
264289
265290#: qml/Panel/ActiveCallHint.qml:77
266291msgid "Tap to return to call..."
@@ -270,27 +295,31 @@ msgstr "Gnog gus tilleadh dhan ghairm..."
270295msgid "Conference"
271296msgstr "Gairm co-labhairt"
272297
273−#: qml/Panel/Indicators/MenuItemFactory.qml:651
298+#: qml/Panel/Indicators/MenuItemFactory.qml:600
299+msgid "Nothing is playing"
300+msgstr "Chan eil dad 'ga chluich"
301+
302+#: qml/Panel/Indicators/MenuItemFactory.qml:748
274303msgid "In queue…"
275304msgstr "Air a' chiudha…"
276305
277−#: qml/Panel/Indicators/MenuItemFactory.qml:655
306+#: qml/Panel/Indicators/MenuItemFactory.qml:752
278307msgid "Downloading"
279308msgstr "'Ga luchdadh a-nuas"
280309
281−#: qml/Panel/Indicators/MenuItemFactory.qml:657
310+#: qml/Panel/Indicators/MenuItemFactory.qml:754
282311msgid "Paused, tap to resume"
283312msgstr "'Na stad, thoir gnogag gus leantainn air"
284313
285−#: qml/Panel/Indicators/MenuItemFactory.qml:659
314+#: qml/Panel/Indicators/MenuItemFactory.qml:756
286315msgid "Canceled"
287316msgstr "Air a sgur dheth"
288317
289−#: qml/Panel/Indicators/MenuItemFactory.qml:661
318+#: qml/Panel/Indicators/MenuItemFactory.qml:758
290319msgid "Finished"
291320msgstr "Coileanta"
292321
293−#: qml/Panel/Indicators/MenuItemFactory.qml:663
322+#: qml/Panel/Indicators/MenuItemFactory.qml:760
294323msgid "Failed, tap to retry"
295324msgstr "Dh'fhàillig leis, thoir gnogag gus feuchainn a-rithist"
296325
@@ -302,58 +331,88 @@ msgstr "Thoir a' ghlas far an SIM"
302331msgid "Roaming"
303332msgstr "Air fàrsan"
304333
305−#: qml/Shell.qml:266
306−msgid "Enter your passphrase"
307−msgstr ""
334+#: qml/Shell.qml:340
335+msgid "Enter passphrase"
336+msgstr "Cuir abairt-fhaire a-steach"
308337
309−#: qml/Shell.qml:267
338+#: qml/Shell.qml:341
310339msgid "Sorry, incorrect passphrase"
311−msgstr ""
340+msgstr "Duilich ach tha an abairt-fhaire cearr"
312341
313−#: qml/Shell.qml:282
314−msgid "Enter your passcode"
315−msgstr ""
342+#: qml/Shell.qml:342
343+msgid "Please re-enter"
344+msgstr "Cuir a-steach e a-rithist"
345+
346+#: qml/Shell.qml:344
347+msgid "Enter passcode"
348+msgstr "Cuir còd-faire a-steach"
316349
317−#: qml/Shell.qml:283
350+#: qml/Shell.qml:345
318351msgid "Sorry, incorrect passcode"
319−msgstr ""
352+msgstr "Duilich ach tha an còd-faire cearr"
320353
321−#: qml/Shell.qml:273
354+#: qml/Shell.qml:348
322355#, qt-format
323−msgid "Enter your %1"
324−msgstr ""
356+msgid "Enter %1"
357+msgstr "Cuir a-steach %1"
325358
326−#: qml/Shell.qml:274
359+#: qml/Shell.qml:349
327360#, qt-format
328361msgid "Sorry, incorrect %1"
329−msgstr ""
362+msgstr "Duilich ach tha a' %1 cearr"
330363
331−#: qml/Shell.qml:310
364+#: qml/Shell.qml:384
332365msgid "Sorry, incorrect passphrase."
333−msgstr ""
366+msgstr "Duilich ach tha an abairt-fhaire cearr."
334367
335−#: qml/Shell.qml:311
368+#: qml/Shell.qml:385
336369msgid "Sorry, incorrect passcode."
337−msgstr ""
370+msgstr "Duilich ach tha an còd-faire cearr."
338371
339−#: qml/Shell.qml:312
372+#: qml/Shell.qml:386
340373msgid "This will be your last attempt."
341−msgstr ""
374+msgstr "Seo an oidhirp mu dheireadh agad."
342375
343−#: qml/Shell.qml:314
376+#: qml/Shell.qml:388
344377msgid ""
345378"If passphrase is entered incorrectly, your phone will conduct a factory "
346379"reset and all personal data will be deleted."
347380msgstr ""
381+"Ma thèid an abairt-fhaire a chur a-steach mar bu chòir, thèid an fhòn agad a "
382+"ath-shuidheachadh air roghainnean an fhactaraidh agus thèid gach dàta "
383+"pearsanta a sguabadh às."
348384
349−#: qml/Shell.qml:315
385+#: qml/Shell.qml:389
350386msgid ""
351387"If passcode is entered incorrectly, your phone will conduct a factory reset "
352388"and all personal data will be deleted."
353389msgstr ""
390+"Ma thèid an còd-faire a chur a-steach mar bu chòir, thèid an fhòn agad a ath-"
391+"shuidheachadh air roghainnean an fhactaraidh agus thèid gach dàta pearsanta "
392+"a sguabadh às."
393+
394+#, qt-format
395+#~ msgid "Hello %1"
396+#~ msgstr "Shin thu, %1"
354397
355−#~ msgid "Are you sure you would like to turn power off?"
356−#~ msgstr "A bheil thu cinnteach gu bheil thu airson a chur dheth?"
398+#~ msgid "Hello"
399+#~ msgstr "Shin thu"
357400
358−#~ msgid "Restart"
359−#~ msgstr "Ath-thòisich"
401+#~ msgid "Swipe to unlock"
402+#~ msgstr "Dèan grad-shlaighdeadh gus a' ghlas a thoirt dheth"
403+
404+#~ msgid "Please wait"
405+#~ msgstr "Fuirich ort"
406+
407+#~ msgid "Too many incorrect attempts"
408+#~ msgstr "Cus oidhirpean leis nach do shoirbhich"
409+
410+#~ msgid "Enter your passphrase"
411+#~ msgstr "Cuir an abairt-fhaire agad a-steach"
412+
413+#~ msgid "Enter your passcode"
414+#~ msgstr "Cuir an còd-faire agad a-steach"
415+
416+#, qt-format
417+#~ msgid "Enter your %1"
418+#~ msgstr "Cuir a-steach a' %1 agad"
po/gl.po+133−92
@@ -7,78 +7,102 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-26 18:24+0200\n"
11−"PO-Revision-Date: 2014-08-22 15:16+0000\n"
10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
11+"PO-Revision-Date: 2014-10-03 04:55+0000\n"
1212"Last-Translator: Marcos Lans <Unknown>\n"
1313"Language-Team: Galician <gl@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-28 06:30+0000\n"
18−"X-Generator: Launchpad (build 17174)\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
18+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"
19+"X-Generator: Launchpad (build 17196)\n"
1920
20−#: plugins/LightDM/Greeter.cpp:129
21+#: plugins/LightDM/Greeter.cpp:130
2122msgid "Password: "
2223msgstr "Contrasinal : "
2324
24−#: plugins/Unity/Launcher/launcheritem.cpp:43
25−#: plugins/Unity/Launcher/launcheritem.cpp:73
25+#: plugins/Unity/Launcher/launcheritem.cpp:45
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
2627msgid "Pin shortcut"
2728msgstr "Fixar o atallo"
2829
29−#: plugins/Unity/Launcher/launcheritem.cpp:73
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
3031msgid "Unpin shortcut"
3132msgstr "Eliminar o atallo"
3233
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr "Dispositivo bloqueado"
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr "Bloqueouse o dispositivo polos intentos fallidos da frase secreta."
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr "Bloqueouse o dispositivo polos intentos fallidos da clave."
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] "Agarde %1 minuto e ténteo de novo…"
51+msgstr[1] "Agarde %1 minutos e ténteo de novo…"
52+
3353#: qml/Components/Dialogs.qml:70
3454msgid "Log out"
35−msgstr ""
55+msgstr "Saír da sesión"
3656
3757#: qml/Components/Dialogs.qml:71
3858msgid "Are you sure you want to log out?"
39−msgstr ""
59+msgstr "Está seguro de querer pechar a sesión?"
4060
4161#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97
4262#: qml/Components/Dialogs.qml:122
4363msgid "No"
44−msgstr ""
64+msgstr "Non"
4565
4666#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104
4767#: qml/Components/Dialogs.qml:129
4868msgid "Yes"
49−msgstr ""
69+msgstr "Si"
5070
5171#: qml/Components/Dialogs.qml:94
5272msgid "Shut down"
53−msgstr ""
73+msgstr "Apagar"
5474
5575#: qml/Components/Dialogs.qml:95
5676msgid "Are you sure you want to shut down?"
57−msgstr ""
77+msgstr "Está seguro de querer apagar?"
5878
5979#: qml/Components/Dialogs.qml:119
6080msgid "Reboot"
61−msgstr ""
81+msgstr "Reiniciar"
6282
6383#: qml/Components/Dialogs.qml:120
6484msgid "Are you sure you want to reboot?"
65−msgstr ""
85+msgstr "Está seguro de querer reiniciar?"
6686
6787#: qml/Components/Dialogs.qml:144
6888msgid "Power"
69−msgstr ""
89+msgstr "Enerxía"
7090
7191#: qml/Components/Dialogs.qml:145
7292msgid ""
7393"Are you sure you would like\n"
7494"to power off?"
75−msgstr ""
95+msgstr "Está seguro de querer apagar?"
7696
77−#: qml/Components/Dialogs.qml:144
97+#: qml/Components/Dialogs.qml:147
7898msgid "Power off"
7999msgstr "Apagar"
80100
81−#: qml/Components/Dialogs.qml:162
101+#: qml/Components/Dialogs.qml:157
102+msgid "Restart"
103+msgstr "Reiniciar"
104+
105+#: qml/Components/Dialogs.qml:167
82106msgid "Cancel"
83107msgstr "Cancelar"
84108
@@ -132,60 +156,44 @@ msgstr ""
132156"Agora xa domina os xestos dos bordos e pode comezar a usar o "
133157"teléfono<br><br>Toque na pantalla para comezar"
134158
135−#: qml/Components/Lockscreen.qml:167
136−msgid "Please wait"
137−msgstr "Agarde"
138−
139−#: qml/Components/Lockscreen.qml:172
140−msgid "Too many incorrect attempts"
141−msgstr "Demasiados erros"
142−
143−#: qml/Components/Lockscreen.qml:206
159+#: qml/Components/Lockscreen.qml:218
144160msgid "Emergency Call"
145161msgstr "Chamada de emerxencia"
146162
147−#: qml/Components/Lockscreen.qml:226
163+#: qml/Components/Lockscreen.qml:250
148164msgid "OK"
149165msgstr "Aceptar"
150166
151−#: qml/Components/PassphraseLockscreen.qml:61
152−#, qt-format
153−msgid "Hello %1"
154−msgstr "Ola %1"
155−
156−#: qml/Components/PassphraseLockscreen.qml:61
157−msgid "Hello"
158−msgstr "Ola"
159−
160−#: qml/Dash/GenericScopeView.qml:361
167+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
161168msgid "See less"
162169msgstr "Ver menos"
163170
164−#: qml/Dash/GenericScopeView.qml:361
171+#: qml/Dash/GenericScopeView.qml:411
165172msgid "See all"
166173msgstr "Ver todo"
167174
168−#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
175+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
176+#: qml/Panel/SearchIndicator.qml:27
169177msgid "Search"
170178msgstr "Buscar"
171179
172−#: qml/Dash/PageHeader.qml:270
180+#: qml/Dash/PageHeader.qml:268
173181msgid "Settings"
174−msgstr ""
182+msgstr "Axustes"
175183
176−#: qml/Dash/PageHeader.qml:279
184+#: qml/Dash/PageHeader.qml:275
177185msgid "Remove from Favorites"
178−msgstr ""
186+msgstr "Eliminar dos favoritos"
179187
180−#: qml/Dash/PageHeader.qml:279
188+#: qml/Dash/PageHeader.qml:275
181189msgid "Add to Favorites"
182−msgstr ""
190+msgstr "Engadir aos favoritos"
183191
184−#: qml/Dash/Previews/PreviewActionCombo.qml:34
192+#: qml/Dash/Previews/PreviewActionCombo.qml:35
185193msgid "More..."
186194msgstr "Máis…"
187195
188−#: qml/Dash/Previews/PreviewActionCombo.qml:34
196+#: qml/Dash/Previews/PreviewActionCombo.qml:35
189197msgid "Less..."
190198msgstr "Menos..."
191199
@@ -201,15 +209,23 @@ msgstr "Engadir unha opinión"
201209msgid "Send"
202210msgstr "Enviar"
203211
204−#: qml/Dash/ScopesOverview.qml:201
205−msgid "Manage Dash"
206−msgstr "Xestión do Panel"
212+#: qml/Dash/PullToRefreshScopeStyle.qml:55
213+msgid "Pull to refresh…"
214+msgstr ""
215+
216+#: qml/Dash/PullToRefreshScopeStyle.qml:60
217+msgid "Release to refresh…"
218+msgstr ""
207219
208−#: qml/Dash/ScopesOverview.qml:408
220+#: qml/Dash/ScopesOverview.qml:206
221+msgid "Manage Scopes"
222+msgstr "Xestionar os Ámbitos"
223+
224+#: qml/Dash/ScopesOverview.qml:428
209225msgid "Done"
210226msgstr "Feito"
211227
212−#: qml/Dash/ScopesOverview.qml:434
228+#: qml/Dash/ScopesOverview.qml:454
213229msgid "Store"
214230msgstr "Tenda"
215231
@@ -222,10 +238,10 @@ msgid "All"
222238msgstr "Todos"
223239
224240#: qml/Greeter/Greeter.qml:157
225−msgid "Swipe to unlock"
226−msgstr "Esvare o dedo para desbloquear"
241+msgid "Unlock"
242+msgstr "Desbloquear"
227243
228−#: qml/Hud/HudParametrizedActionsPage.qml:132
244+#: qml/Hud/HudParametrizedActionsPage.qml:139
229245msgid "Confirm"
230246msgstr "Confirmar"
231247
@@ -245,15 +261,15 @@ msgstr "Fale agora…"
245261msgid "Speaking..."
246262msgstr "Falando…"
247263
248−#: qml/Notifications/NotificationMenuItemFactory.qml:105
264+#: qml/Notifications/NotificationMenuItemFactory.qml:108
249265msgid "Show password"
250266msgstr "Mostrar contrasinal"
251267
252−#: qml/Notifications/NotificationMenuItemFactory.qml:120
268+#: qml/Notifications/NotificationMenuItemFactory.qml:124
253269msgid "Enter SIM PIN"
254270msgstr "Introduza o PIN da SIM"
255271
256−#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
272+#: qml/Notifications/NotificationMenuItemFactory.qml:125
257273msgid "Sorry, incorrect PIN"
258274msgstr "Sentímolo, o PIN é incorrecto"
259275
@@ -265,27 +281,31 @@ msgstr "Toque para volver a chamar..."
265281msgid "Conference"
266282msgstr "Conferencia"
267283
268−#: qml/Panel/Indicators/MenuItemFactory.qml:651
284+#: qml/Panel/Indicators/MenuItemFactory.qml:600
285+msgid "Nothing is playing"
286+msgstr "Non hai nada en reprodución"
287+
288+#: qml/Panel/Indicators/MenuItemFactory.qml:748
269289msgid "In queue…"
270290msgstr "Na cola..."
271291
272−#: qml/Panel/Indicators/MenuItemFactory.qml:655
292+#: qml/Panel/Indicators/MenuItemFactory.qml:752
273293msgid "Downloading"
274294msgstr "Descargando"
275295
276−#: qml/Panel/Indicators/MenuItemFactory.qml:657
296+#: qml/Panel/Indicators/MenuItemFactory.qml:754
277297msgid "Paused, tap to resume"
278298msgstr "Detido, toque para continuar"
279299
280−#: qml/Panel/Indicators/MenuItemFactory.qml:659
300+#: qml/Panel/Indicators/MenuItemFactory.qml:756
281301msgid "Canceled"
282302msgstr "Cancelado"
283303
284−#: qml/Panel/Indicators/MenuItemFactory.qml:661
304+#: qml/Panel/Indicators/MenuItemFactory.qml:758
285305msgid "Finished"
286306msgstr "Rematado"
287307
288−#: qml/Panel/Indicators/MenuItemFactory.qml:663
308+#: qml/Panel/Indicators/MenuItemFactory.qml:760
289309msgid "Failed, tap to retry"
290310msgstr "Fallou, toque para reintentar"
291311
@@ -297,45 +317,49 @@ msgstr "Desbloquear a SIM"
297317msgid "Roaming"
298318msgstr "Itinerancia"
299319
300−#: qml/Shell.qml:266
301−msgid "Enter your passphrase"
302−msgstr "Introduza a frase de paso"
320+#: qml/Shell.qml:340
321+msgid "Enter passphrase"
322+msgstr "Introduza a frase secreta"
303323
304−#: qml/Shell.qml:267
324+#: qml/Shell.qml:341
305325msgid "Sorry, incorrect passphrase"
306326msgstr "Sentímolo a frase é incorrecta"
307327
308−#: qml/Shell.qml:282
309−msgid "Enter your passcode"
310−msgstr ""
328+#: qml/Shell.qml:342
329+msgid "Please re-enter"
330+msgstr "Introducir de novo"
331+
332+#: qml/Shell.qml:344
333+msgid "Enter passcode"
334+msgstr "Introduza a clave"
311335
312−#: qml/Shell.qml:283
336+#: qml/Shell.qml:345
313337msgid "Sorry, incorrect passcode"
314−msgstr ""
338+msgstr "Sentímolo, a clave é incorrecta"
315339
316−#: qml/Shell.qml:273
340+#: qml/Shell.qml:348
317341#, qt-format
318−msgid "Enter your %1"
342+msgid "Enter %1"
319343msgstr "Introducir %1"
320344
321−#: qml/Shell.qml:274
345+#: qml/Shell.qml:349
322346#, qt-format
323347msgid "Sorry, incorrect %1"
324−msgstr "Sentímolo, %1 incorrecto"
348+msgstr "Sentímolo, %1 non coincide"
325349
326−#: qml/Shell.qml:310
350+#: qml/Shell.qml:384
327351msgid "Sorry, incorrect passphrase."
328−msgstr "Sentímolo é incorrecta."
352+msgstr "Sentímolo a frase é incorrecta."
329353
330−#: qml/Shell.qml:311
354+#: qml/Shell.qml:385
331355msgid "Sorry, incorrect passcode."
332356msgstr "Sentímolo, a clave é incorrecta."
333357
334−#: qml/Shell.qml:312
358+#: qml/Shell.qml:386
335359msgid "This will be your last attempt."
336360msgstr "Este será o seu último intento."
337361
338−#: qml/Shell.qml:314
362+#: qml/Shell.qml:388
339363msgid ""
340364"If passphrase is entered incorrectly, your phone will conduct a factory "
341365"reset and all personal data will be deleted."
@@ -343,7 +367,7 @@ msgstr ""
343367"Se a frase de paso introducida é incorrecta, o teléfono restabelecerá os "
344368"valores de fábrica e perderá todos os datos persoais."
345369
346−#: qml/Shell.qml:315
370+#: qml/Shell.qml:389
347371msgid ""
348372"If passcode is entered incorrectly, your phone will conduct a factory reset "
349373"and all personal data will be deleted."
@@ -351,11 +375,28 @@ msgstr ""
351375"Se a clave introducida é incorrecta, o teléfono restabelecerá os valores de "
352376"fábrica e perderá todos os datos persoais."
353377
354−#~ msgid "Are you sure you would like to turn power off?"
355−#~ msgstr "Está certo de apagar o aparato?"
378+#, qt-format
379+#~ msgid "Hello %1"
380+#~ msgstr "Ola %1"
381+
382+#~ msgid "Hello"
383+#~ msgstr "Ola"
384+
385+#~ msgid "Swipe to unlock"
386+#~ msgstr "Esvare o dedo para desbloquear"
387+
388+#~ msgid "Please wait"
389+#~ msgstr "Agarde"
390+
391+#~ msgid "Too many incorrect attempts"
392+#~ msgstr "Demasiados erros"
393+
394+#, qt-format
395+#~ msgid "Enter your %1"
396+#~ msgstr "Introducir %1"
356397
357−#~ msgid "Restart"
358−#~ msgstr "Reiniciar"
398+#~ msgid "Enter your passcode"
399+#~ msgstr "Introduza a clave"
359400
360−#~ msgid "Enter your PIN"
361−#~ msgstr "Introduza o PIN"
401+#~ msgid "Enter your passphrase"
402+#~ msgstr "Introduza a frase secreta"
po/he.po+108−71
@@ -7,29 +7,49 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-26 18:24+0200\n"
10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
1111"PO-Revision-Date: 2014-08-23 14:19+0000\n"
1212"Last-Translator: Yaron <sh.yaron@gmail.com>\n"
1313"Language-Team: Hebrew <he@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-28 06:30+0000\n"
18−"X-Generator: Launchpad (build 17174)\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
18+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"
19+"X-Generator: Launchpad (build 17196)\n"
1920
20−#: plugins/LightDM/Greeter.cpp:129
21+#: plugins/LightDM/Greeter.cpp:130
2122msgid "Password: "
2223msgstr "ססמה: "
2324
24−#: plugins/Unity/Launcher/launcheritem.cpp:43
25−#: plugins/Unity/Launcher/launcheritem.cpp:73
25+#: plugins/Unity/Launcher/launcheritem.cpp:45
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
2627msgid "Pin shortcut"
2728msgstr "הצמדת קיצור דרך"
2829
29−#: plugins/Unity/Launcher/launcheritem.cpp:73
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
3031msgid "Unpin shortcut"
3132msgstr "הפרדת קיצור הדרך"
3233
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
3353#: qml/Components/Dialogs.qml:70
3454msgid "Log out"
3555msgstr ""
@@ -74,11 +94,15 @@ msgid ""
7494"to power off?"
7595msgstr ""
7696
77−#: qml/Components/Dialogs.qml:144
97+#: qml/Components/Dialogs.qml:147
7898msgid "Power off"
7999msgstr "כיבוי"
80100
81−#: qml/Components/Dialogs.qml:162
101+#: qml/Components/Dialogs.qml:157
102+msgid "Restart"
103+msgstr ""
104+
105+#: qml/Components/Dialogs.qml:167
82106msgid "Cancel"
83107msgstr "ביטול"
84108
@@ -130,60 +154,44 @@ msgstr ""
130154"ברגעים אלו סיימת את התמחותך בשימוש במחוות קצה והטלפון פתוח לשימושך<br><br>נא "
131155"לגעת במסך כדי להתחיל"
132156
133−#: qml/Components/Lockscreen.qml:167
134−msgid "Please wait"
135−msgstr "נא להמתין"
136−
137−#: qml/Components/Lockscreen.qml:172
138−msgid "Too many incorrect attempts"
139−msgstr "יותר מדי ניסיונות שגויים"
140−
141−#: qml/Components/Lockscreen.qml:206
157+#: qml/Components/Lockscreen.qml:218
142158msgid "Emergency Call"
143159msgstr "שיחת חירום"
144160
145−#: qml/Components/Lockscreen.qml:226
161+#: qml/Components/Lockscreen.qml:250
146162msgid "OK"
147163msgstr "אישור"
148164
149−#: qml/Components/PassphraseLockscreen.qml:61
150−#, qt-format
151−msgid "Hello %1"
152−msgstr "שלום %1"
153−
154−#: qml/Components/PassphraseLockscreen.qml:61
155−msgid "Hello"
156−msgstr "שלום"
157−
158−#: qml/Dash/GenericScopeView.qml:361
165+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
159166msgid "See less"
160167msgstr "לראות פחות"
161168
162−#: qml/Dash/GenericScopeView.qml:361
169+#: qml/Dash/GenericScopeView.qml:411
163170msgid "See all"
164171msgstr "להציג הכול"
165172
166−#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
173+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
174+#: qml/Panel/SearchIndicator.qml:27
167175msgid "Search"
168176msgstr "חיפוש"
169177
170−#: qml/Dash/PageHeader.qml:270
178+#: qml/Dash/PageHeader.qml:268
171179msgid "Settings"
172180msgstr ""
173181
174−#: qml/Dash/PageHeader.qml:279
182+#: qml/Dash/PageHeader.qml:275
175183msgid "Remove from Favorites"
176184msgstr ""
177185
178−#: qml/Dash/PageHeader.qml:279
186+#: qml/Dash/PageHeader.qml:275
179187msgid "Add to Favorites"
180188msgstr ""
181189
182−#: qml/Dash/Previews/PreviewActionCombo.qml:34
190+#: qml/Dash/Previews/PreviewActionCombo.qml:35
183191msgid "More..."
184192msgstr "עוד…"
185193
186−#: qml/Dash/Previews/PreviewActionCombo.qml:34
194+#: qml/Dash/Previews/PreviewActionCombo.qml:35
187195msgid "Less..."
188196msgstr "פחות…"
189197
@@ -199,15 +207,23 @@ msgstr "הוספת סקירה"
199207msgid "Send"
200208msgstr "שליחה"
201209
202−#: qml/Dash/ScopesOverview.qml:201
203−msgid "Manage Dash"
210+#: qml/Dash/PullToRefreshScopeStyle.qml:55
211+msgid "Pull to refresh…"
204212msgstr ""
205213
206−#: qml/Dash/ScopesOverview.qml:408
214+#: qml/Dash/PullToRefreshScopeStyle.qml:60
215+msgid "Release to refresh…"
216+msgstr ""
217+
218+#: qml/Dash/ScopesOverview.qml:206
219+msgid "Manage Scopes"
220+msgstr ""
221+
222+#: qml/Dash/ScopesOverview.qml:428
207223msgid "Done"
208224msgstr "סיימתי"
209225
210−#: qml/Dash/ScopesOverview.qml:434
226+#: qml/Dash/ScopesOverview.qml:454
211227msgid "Store"
212228msgstr "אחסון"
213229
@@ -220,10 +236,10 @@ msgid "All"
220236msgstr "הכול"
221237
222238#: qml/Greeter/Greeter.qml:157
223−msgid "Swipe to unlock"
224−msgstr "יש להחליק לפתיחה"
239+msgid "Unlock"
240+msgstr ""
225241
226−#: qml/Hud/HudParametrizedActionsPage.qml:132
242+#: qml/Hud/HudParametrizedActionsPage.qml:139
227243msgid "Confirm"
228244msgstr "אישור"
229245
@@ -243,15 +259,15 @@ msgstr "יש לדבר כעת..."
243259msgid "Speaking..."
244260msgstr "הדיבור מושמע…"
245261
246−#: qml/Notifications/NotificationMenuItemFactory.qml:105
262+#: qml/Notifications/NotificationMenuItemFactory.qml:108
247263msgid "Show password"
248264msgstr "הצגת הססמה"
249265
250−#: qml/Notifications/NotificationMenuItemFactory.qml:120
266+#: qml/Notifications/NotificationMenuItemFactory.qml:124
251267msgid "Enter SIM PIN"
252268msgstr ""
253269
254−#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
270+#: qml/Notifications/NotificationMenuItemFactory.qml:125
255271msgid "Sorry, incorrect PIN"
256272msgstr ""
257273
@@ -263,27 +279,31 @@ msgstr "יש לגעת כדי להחזיר שיחה…"
263279msgid "Conference"
264280msgstr "ועידה"
265281
266−#: qml/Panel/Indicators/MenuItemFactory.qml:651
282+#: qml/Panel/Indicators/MenuItemFactory.qml:600
283+msgid "Nothing is playing"
284+msgstr ""
285+
286+#: qml/Panel/Indicators/MenuItemFactory.qml:748
267287msgid "In queue…"
268288msgstr "בתור…"
269289
270−#: qml/Panel/Indicators/MenuItemFactory.qml:655
290+#: qml/Panel/Indicators/MenuItemFactory.qml:752
271291msgid "Downloading"
272292msgstr "בהורדה"
273293
274−#: qml/Panel/Indicators/MenuItemFactory.qml:657
294+#: qml/Panel/Indicators/MenuItemFactory.qml:754
275295msgid "Paused, tap to resume"
276296msgstr "מושהה, יש לגעת כדי להמשיך"
277297
278−#: qml/Panel/Indicators/MenuItemFactory.qml:659
298+#: qml/Panel/Indicators/MenuItemFactory.qml:756
279299msgid "Canceled"
280300msgstr "בוטל"
281301
282−#: qml/Panel/Indicators/MenuItemFactory.qml:661
302+#: qml/Panel/Indicators/MenuItemFactory.qml:758
283303msgid "Finished"
284304msgstr "הושלם"
285305
286−#: qml/Panel/Indicators/MenuItemFactory.qml:663
306+#: qml/Panel/Indicators/MenuItemFactory.qml:760
287307msgid "Failed, tap to retry"
288308msgstr "נכשל, יש לגעת כדי לנסות שוב"
289309
@@ -295,58 +315,75 @@ msgstr ""
295315msgid "Roaming"
296316msgstr "נדידה"
297317
298−#: qml/Shell.qml:266
299−msgid "Enter your passphrase"
300−msgstr "נא להזין את מילת הצופן שלך"
318+#: qml/Shell.qml:340
319+msgid "Enter passphrase"
320+msgstr ""
301321
302−#: qml/Shell.qml:267
322+#: qml/Shell.qml:341
303323msgid "Sorry, incorrect passphrase"
304324msgstr "מילת הצופן שגויה, עמך הסליחה."
305325
306−#: qml/Shell.qml:282
307−msgid "Enter your passcode"
326+#: qml/Shell.qml:342
327+msgid "Please re-enter"
308328msgstr ""
309329
310−#: qml/Shell.qml:283
330+#: qml/Shell.qml:344
331+msgid "Enter passcode"
332+msgstr ""
333+
334+#: qml/Shell.qml:345
311335msgid "Sorry, incorrect passcode"
312336msgstr ""
313337
314−#: qml/Shell.qml:273
338+#: qml/Shell.qml:348
315339#, qt-format
316−msgid "Enter your %1"
340+msgid "Enter %1"
317341msgstr ""
318342
319−#: qml/Shell.qml:274
343+#: qml/Shell.qml:349
320344#, qt-format
321345msgid "Sorry, incorrect %1"
322346msgstr ""
323347
324−#: qml/Shell.qml:310
348+#: qml/Shell.qml:384
325349msgid "Sorry, incorrect passphrase."
326350msgstr "מילת הצופן שגויה, עמך הסליחה."
327351
328−#: qml/Shell.qml:311
352+#: qml/Shell.qml:385
329353msgid "Sorry, incorrect passcode."
330354msgstr "הצופן שגוי, עם הסליחה."
331355
332−#: qml/Shell.qml:312
356+#: qml/Shell.qml:386
333357msgid "This will be your last attempt."
334358msgstr "זה יהיה הניסיון האחרון שלך."
335359
336−#: qml/Shell.qml:314
360+#: qml/Shell.qml:388
337361msgid ""
338362"If passphrase is entered incorrectly, your phone will conduct a factory "
339363"reset and all personal data will be deleted."
340364msgstr ""
341365
342−#: qml/Shell.qml:315
366+#: qml/Shell.qml:389
343367msgid ""
344368"If passcode is entered incorrectly, your phone will conduct a factory reset "
345369"and all personal data will be deleted."
346370msgstr ""
347371
348−#~ msgid "Restart"
349−#~ msgstr "הפעלה מחדש"
372+#, qt-format
373+#~ msgid "Hello %1"
374+#~ msgstr "שלום %1"
375+
376+#~ msgid "Hello"
377+#~ msgstr "שלום"
378+
379+#~ msgid "Swipe to unlock"
380+#~ msgstr "יש להחליק לפתיחה"
381+
382+#~ msgid "Please wait"
383+#~ msgstr "נא להמתין"
384+
385+#~ msgid "Enter your passphrase"
386+#~ msgstr "נא להזין את מילת הצופן שלך"
350387
351−#~ msgid "Are you sure you would like to turn power off?"
352−#~ msgstr "האם ברצונך לכבות את המכשיר?"
388+#~ msgid "Too many incorrect attempts"
389+#~ msgstr "יותר מדי ניסיונות שגויים"
po/hi.po+92−65
@@ -7,29 +7,49 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-26 18:24+0200\n"
10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
1111"PO-Revision-Date: 2014-01-15 01:49+0000\n"
1212"Last-Translator: Siddhanathan S. <Unknown>\n"
1313"Language-Team: Hindi <hi@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-28 06:30+0000\n"
18−"X-Generator: Launchpad (build 17174)\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
18+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"
19+"X-Generator: Launchpad (build 17196)\n"
1920
20−#: plugins/LightDM/Greeter.cpp:129
21+#: plugins/LightDM/Greeter.cpp:130
2122msgid "Password: "
2223msgstr ""
2324
24−#: plugins/Unity/Launcher/launcheritem.cpp:43
25−#: plugins/Unity/Launcher/launcheritem.cpp:73
25+#: plugins/Unity/Launcher/launcheritem.cpp:45
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
2627msgid "Pin shortcut"
2728msgstr ""
2829
29−#: plugins/Unity/Launcher/launcheritem.cpp:73
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
3031msgid "Unpin shortcut"
3132msgstr ""
3233
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
3353#: qml/Components/Dialogs.qml:70
3454msgid "Log out"
3555msgstr ""
@@ -74,11 +94,15 @@ msgid ""
7494"to power off?"
7595msgstr ""
7696
77−#: qml/Components/Dialogs.qml:144
97+#: qml/Components/Dialogs.qml:147
7898msgid "Power off"
7999msgstr ""
80100
81−#: qml/Components/Dialogs.qml:162
101+#: qml/Components/Dialogs.qml:157
102+msgid "Restart"
103+msgstr ""
104+
105+#: qml/Components/Dialogs.qml:167
82106msgid "Cancel"
83107msgstr ""
84108
@@ -128,60 +152,44 @@ msgid ""
128152"phone<br><br>Tap on the screen to start"
129153msgstr ""
130154
131−#: qml/Components/Lockscreen.qml:167
132−msgid "Please wait"
133−msgstr ""
134−
135−#: qml/Components/Lockscreen.qml:172
136−msgid "Too many incorrect attempts"
137−msgstr ""
138−
139−#: qml/Components/Lockscreen.qml:206
155+#: qml/Components/Lockscreen.qml:218
140156msgid "Emergency Call"
141157msgstr "आपातकालीन कॉल"
142158
143−#: qml/Components/Lockscreen.qml:226
159+#: qml/Components/Lockscreen.qml:250
144160msgid "OK"
145161msgstr ""
146162
147−#: qml/Components/PassphraseLockscreen.qml:61
148−#, qt-format
149−msgid "Hello %1"
150−msgstr ""
151−
152−#: qml/Components/PassphraseLockscreen.qml:61
153−msgid "Hello"
154−msgstr "नमस्ते"
155−
156−#: qml/Dash/GenericScopeView.qml:361
163+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
157164msgid "See less"
158165msgstr ""
159166
160−#: qml/Dash/GenericScopeView.qml:361
167+#: qml/Dash/GenericScopeView.qml:411
161168msgid "See all"
162169msgstr ""
163170
164−#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
171+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
172+#: qml/Panel/SearchIndicator.qml:27
165173msgid "Search"
166174msgstr "खोजें"
167175
168−#: qml/Dash/PageHeader.qml:270
176+#: qml/Dash/PageHeader.qml:268
169177msgid "Settings"
170178msgstr ""
171179
172−#: qml/Dash/PageHeader.qml:279
180+#: qml/Dash/PageHeader.qml:275
173181msgid "Remove from Favorites"
174182msgstr ""
175183
176−#: qml/Dash/PageHeader.qml:279
184+#: qml/Dash/PageHeader.qml:275
177185msgid "Add to Favorites"
178186msgstr ""
179187
180−#: qml/Dash/Previews/PreviewActionCombo.qml:34
188+#: qml/Dash/Previews/PreviewActionCombo.qml:35
181189msgid "More..."
182190msgstr ""
183191
184−#: qml/Dash/Previews/PreviewActionCombo.qml:34
192+#: qml/Dash/Previews/PreviewActionCombo.qml:35
185193msgid "Less..."
186194msgstr ""
187195
@@ -197,15 +205,23 @@ msgstr "समीक्षा दे"
197205msgid "Send"
198206msgstr "भेजें"
199207
200−#: qml/Dash/ScopesOverview.qml:201
201−msgid "Manage Dash"
208+#: qml/Dash/PullToRefreshScopeStyle.qml:55
209+msgid "Pull to refresh…"
210+msgstr ""
211+
212+#: qml/Dash/PullToRefreshScopeStyle.qml:60
213+msgid "Release to refresh…"
202214msgstr ""
203215
204−#: qml/Dash/ScopesOverview.qml:408
216+#: qml/Dash/ScopesOverview.qml:206
217+msgid "Manage Scopes"
218+msgstr ""
219+
220+#: qml/Dash/ScopesOverview.qml:428
205221msgid "Done"
206222msgstr ""
207223
208−#: qml/Dash/ScopesOverview.qml:434
224+#: qml/Dash/ScopesOverview.qml:454
209225msgid "Store"
210226msgstr ""
211227
@@ -218,10 +234,10 @@ msgid "All"
218234msgstr ""
219235
220236#: qml/Greeter/Greeter.qml:157
221−msgid "Swipe to unlock"
237+msgid "Unlock"
222238msgstr ""
223239
224−#: qml/Hud/HudParametrizedActionsPage.qml:132
240+#: qml/Hud/HudParametrizedActionsPage.qml:139
225241msgid "Confirm"
226242msgstr ""
227243
@@ -241,15 +257,15 @@ msgstr "अब बात करें"
241257msgid "Speaking..."
242258msgstr "अब बोल रहे हैं"
243259
244−#: qml/Notifications/NotificationMenuItemFactory.qml:105
260+#: qml/Notifications/NotificationMenuItemFactory.qml:108
245261msgid "Show password"
246262msgstr ""
247263
248−#: qml/Notifications/NotificationMenuItemFactory.qml:120
264+#: qml/Notifications/NotificationMenuItemFactory.qml:124
249265msgid "Enter SIM PIN"
250266msgstr ""
251267
252−#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
268+#: qml/Notifications/NotificationMenuItemFactory.qml:125
253269msgid "Sorry, incorrect PIN"
254270msgstr ""
255271
@@ -261,27 +277,31 @@ msgstr ""
261277msgid "Conference"
262278msgstr ""
263279
264−#: qml/Panel/Indicators/MenuItemFactory.qml:651
280+#: qml/Panel/Indicators/MenuItemFactory.qml:600
281+msgid "Nothing is playing"
282+msgstr ""
283+
284+#: qml/Panel/Indicators/MenuItemFactory.qml:748
265285msgid "In queue…"
266286msgstr ""
267287
268−#: qml/Panel/Indicators/MenuItemFactory.qml:655
288+#: qml/Panel/Indicators/MenuItemFactory.qml:752
269289msgid "Downloading"
270290msgstr ""
271291
272−#: qml/Panel/Indicators/MenuItemFactory.qml:657
292+#: qml/Panel/Indicators/MenuItemFactory.qml:754
273293msgid "Paused, tap to resume"
274294msgstr ""
275295
276−#: qml/Panel/Indicators/MenuItemFactory.qml:659
296+#: qml/Panel/Indicators/MenuItemFactory.qml:756
277297msgid "Canceled"
278298msgstr ""
279299
280−#: qml/Panel/Indicators/MenuItemFactory.qml:661
300+#: qml/Panel/Indicators/MenuItemFactory.qml:758
281301msgid "Finished"
282302msgstr ""
283303
284−#: qml/Panel/Indicators/MenuItemFactory.qml:663
304+#: qml/Panel/Indicators/MenuItemFactory.qml:760
285305msgid "Failed, tap to retry"
286306msgstr ""
287307
@@ -293,52 +313,59 @@ msgstr ""
293313msgid "Roaming"
294314msgstr ""
295315
296−#: qml/Shell.qml:266
297−msgid "Enter your passphrase"
316+#: qml/Shell.qml:340
317+msgid "Enter passphrase"
298318msgstr ""
299319
300−#: qml/Shell.qml:267
320+#: qml/Shell.qml:341
301321msgid "Sorry, incorrect passphrase"
302322msgstr ""
303323
304−#: qml/Shell.qml:282
305−msgid "Enter your passcode"
324+#: qml/Shell.qml:342
325+msgid "Please re-enter"
306326msgstr ""
307327
308−#: qml/Shell.qml:283
328+#: qml/Shell.qml:344
329+msgid "Enter passcode"
330+msgstr ""
331+
332+#: qml/Shell.qml:345
309333msgid "Sorry, incorrect passcode"
310334msgstr ""
311335
312−#: qml/Shell.qml:273
336+#: qml/Shell.qml:348
313337#, qt-format
314−msgid "Enter your %1"
338+msgid "Enter %1"
315339msgstr ""
316340
317−#: qml/Shell.qml:274
341+#: qml/Shell.qml:349
318342#, qt-format
319343msgid "Sorry, incorrect %1"
320344msgstr ""
321345
322−#: qml/Shell.qml:310
346+#: qml/Shell.qml:384
323347msgid "Sorry, incorrect passphrase."
324348msgstr ""
325349
326−#: qml/Shell.qml:311
350+#: qml/Shell.qml:385
327351msgid "Sorry, incorrect passcode."
328352msgstr ""
329353
330−#: qml/Shell.qml:312
354+#: qml/Shell.qml:386
331355msgid "This will be your last attempt."
332356msgstr ""
333357
334−#: qml/Shell.qml:314
358+#: qml/Shell.qml:388
335359msgid ""
336360"If passphrase is entered incorrectly, your phone will conduct a factory "
337361"reset and all personal data will be deleted."
338362msgstr ""
339363
340−#: qml/Shell.qml:315
364+#: qml/Shell.qml:389
341365msgid ""
342366"If passcode is entered incorrectly, your phone will conduct a factory reset "
343367"and all personal data will be deleted."
344368msgstr ""
369+
370+#~ msgid "Hello"
371+#~ msgstr "नमस्ते"
po/hr.po+90−65
@@ -7,29 +7,50 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-26 18:24+0200\n"
10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
1111"PO-Revision-Date: 2013-06-27 04:14+0000\n"
1212"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"
1313"Language-Team: Croatian <hr@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-28 06:30+0000\n"
18−"X-Generator: Launchpad (build 17174)\n"
17+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
18+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
19+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"
20+"X-Generator: Launchpad (build 17196)\n"
1921
20−#: plugins/LightDM/Greeter.cpp:129
22+#: plugins/LightDM/Greeter.cpp:130
2123msgid "Password: "
2224msgstr ""
2325
24−#: plugins/Unity/Launcher/launcheritem.cpp:43
25−#: plugins/Unity/Launcher/launcheritem.cpp:73
26+#: plugins/Unity/Launcher/launcheritem.cpp:45
27+#: plugins/Unity/Launcher/launcheritem.cpp:91
2628msgid "Pin shortcut"
2729msgstr ""
2830
29−#: plugins/Unity/Launcher/launcheritem.cpp:73
31+#: plugins/Unity/Launcher/launcheritem.cpp:91
3032msgid "Unpin shortcut"
3133msgstr ""
3234
35+#: qml/Components/DelayedLockscreen.qml:47
36+msgid "Device Locked"
37+msgstr ""
38+
39+#: qml/Components/DelayedLockscreen.qml:62
40+msgid "You have been locked out due to too many failed passphrase attempts."
41+msgstr ""
42+
43+#: qml/Components/DelayedLockscreen.qml:63
44+msgid "You have been locked out due to too many failed passcode attempts."
45+msgstr ""
46+
47+#: qml/Components/DelayedLockscreen.qml:72
48+#, qt-format
49+msgid "Please wait %1 minute and then try again…"
50+msgid_plural "Please wait %1 minutes and then try again…"
51+msgstr[0] ""
52+msgstr[1] ""
53+
3354#: qml/Components/Dialogs.qml:70
3455msgid "Log out"
3556msgstr ""
@@ -74,11 +95,15 @@ msgid ""
7495"to power off?"
7596msgstr ""
7697
77−#: qml/Components/Dialogs.qml:144
98+#: qml/Components/Dialogs.qml:147
7899msgid "Power off"
79100msgstr ""
80101
81−#: qml/Components/Dialogs.qml:162
102+#: qml/Components/Dialogs.qml:157
103+msgid "Restart"
104+msgstr ""
105+
106+#: qml/Components/Dialogs.qml:167
82107msgid "Cancel"
83108msgstr ""
84109
@@ -128,60 +153,44 @@ msgid ""
128153"phone<br><br>Tap on the screen to start"
129154msgstr ""
130155
131−#: qml/Components/Lockscreen.qml:167
132−msgid "Please wait"
133−msgstr ""
134−
135−#: qml/Components/Lockscreen.qml:172
136−msgid "Too many incorrect attempts"
137−msgstr ""
138−
139−#: qml/Components/Lockscreen.qml:206
156+#: qml/Components/Lockscreen.qml:218
140157msgid "Emergency Call"
141158msgstr ""
142159
143−#: qml/Components/Lockscreen.qml:226
160+#: qml/Components/Lockscreen.qml:250
144161msgid "OK"
145162msgstr ""
146163
147−#: qml/Components/PassphraseLockscreen.qml:61
148−#, qt-format
149−msgid "Hello %1"
150−msgstr ""
151−
152−#: qml/Components/PassphraseLockscreen.qml:61
153−msgid "Hello"
154−msgstr ""
155−
156−#: qml/Dash/GenericScopeView.qml:361
164+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
157165msgid "See less"
158166msgstr ""
159167
160−#: qml/Dash/GenericScopeView.qml:361
168+#: qml/Dash/GenericScopeView.qml:411
161169msgid "See all"
162170msgstr ""
163171
164−#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
172+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
173+#: qml/Panel/SearchIndicator.qml:27
165174msgid "Search"
166175msgstr "Pretraživanje"
167176
168−#: qml/Dash/PageHeader.qml:270
177+#: qml/Dash/PageHeader.qml:268
169178msgid "Settings"
170179msgstr ""
171180
172−#: qml/Dash/PageHeader.qml:279
181+#: qml/Dash/PageHeader.qml:275
173182msgid "Remove from Favorites"
174183msgstr ""
175184
176−#: qml/Dash/PageHeader.qml:279
185+#: qml/Dash/PageHeader.qml:275
177186msgid "Add to Favorites"
178187msgstr ""
179188
180−#: qml/Dash/Previews/PreviewActionCombo.qml:34
189+#: qml/Dash/Previews/PreviewActionCombo.qml:35
181190msgid "More..."
182191msgstr ""
183192
184−#: qml/Dash/Previews/PreviewActionCombo.qml:34
193+#: qml/Dash/Previews/PreviewActionCombo.qml:35
185194msgid "Less..."
186195msgstr ""
187196
@@ -197,15 +206,23 @@ msgstr ""
197206msgid "Send"
198207msgstr ""
199208
200−#: qml/Dash/ScopesOverview.qml:201
201−msgid "Manage Dash"
209+#: qml/Dash/PullToRefreshScopeStyle.qml:55
210+msgid "Pull to refresh…"
211+msgstr ""
212+
213+#: qml/Dash/PullToRefreshScopeStyle.qml:60
214+msgid "Release to refresh…"
215+msgstr ""
216+
217+#: qml/Dash/ScopesOverview.qml:206
218+msgid "Manage Scopes"
202219msgstr ""
203220
204−#: qml/Dash/ScopesOverview.qml:408
221+#: qml/Dash/ScopesOverview.qml:428
205222msgid "Done"
206223msgstr ""
207224
208−#: qml/Dash/ScopesOverview.qml:434
225+#: qml/Dash/ScopesOverview.qml:454
209226msgid "Store"
210227msgstr ""
211228
@@ -218,10 +235,10 @@ msgid "All"
218235msgstr ""
219236
220237#: qml/Greeter/Greeter.qml:157
221−msgid "Swipe to unlock"
238+msgid "Unlock"
222239msgstr ""
223240
224−#: qml/Hud/HudParametrizedActionsPage.qml:132
241+#: qml/Hud/HudParametrizedActionsPage.qml:139
225242msgid "Confirm"
226243msgstr "Potvrdi"
227244
@@ -241,15 +258,15 @@ msgstr "Recite..."
241258msgid "Speaking..."
242259msgstr "Govor..."
243260
244−#: qml/Notifications/NotificationMenuItemFactory.qml:105
261+#: qml/Notifications/NotificationMenuItemFactory.qml:108
245262msgid "Show password"
246263msgstr ""
247264
248−#: qml/Notifications/NotificationMenuItemFactory.qml:120
265+#: qml/Notifications/NotificationMenuItemFactory.qml:124
249266msgid "Enter SIM PIN"
250267msgstr ""
251268
252−#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
269+#: qml/Notifications/NotificationMenuItemFactory.qml:125
253270msgid "Sorry, incorrect PIN"
254271msgstr ""
255272
@@ -261,27 +278,31 @@ msgstr ""
261278msgid "Conference"
262279msgstr ""
263280
264−#: qml/Panel/Indicators/MenuItemFactory.qml:651
281+#: qml/Panel/Indicators/MenuItemFactory.qml:600
282+msgid "Nothing is playing"
283+msgstr ""
284+
285+#: qml/Panel/Indicators/MenuItemFactory.qml:748
265286msgid "In queue…"
266287msgstr ""
267288
268−#: qml/Panel/Indicators/MenuItemFactory.qml:655
289+#: qml/Panel/Indicators/MenuItemFactory.qml:752
269290msgid "Downloading"
270291msgstr ""
271292
272−#: qml/Panel/Indicators/MenuItemFactory.qml:657
293+#: qml/Panel/Indicators/MenuItemFactory.qml:754
273294msgid "Paused, tap to resume"
274295msgstr ""
275296
276−#: qml/Panel/Indicators/MenuItemFactory.qml:659
297+#: qml/Panel/Indicators/MenuItemFactory.qml:756
277298msgid "Canceled"
278299msgstr ""
279300
280−#: qml/Panel/Indicators/MenuItemFactory.qml:661
301+#: qml/Panel/Indicators/MenuItemFactory.qml:758
281302msgid "Finished"
282303msgstr ""
283304
284−#: qml/Panel/Indicators/MenuItemFactory.qml:663
305+#: qml/Panel/Indicators/MenuItemFactory.qml:760
285306msgid "Failed, tap to retry"
286307msgstr ""
287308
@@ -293,51 +314,55 @@ msgstr ""
293314msgid "Roaming"
294315msgstr ""
295316
296−#: qml/Shell.qml:266
297−msgid "Enter your passphrase"
317+#: qml/Shell.qml:340
318+msgid "Enter passphrase"
298319msgstr ""
299320
300−#: qml/Shell.qml:267
321+#: qml/Shell.qml:341
301322msgid "Sorry, incorrect passphrase"
302323msgstr ""
303324
304−#: qml/Shell.qml:282
305−msgid "Enter your passcode"
325+#: qml/Shell.qml:342
326+msgid "Please re-enter"
327+msgstr ""
328+
329+#: qml/Shell.qml:344
330+msgid "Enter passcode"
306331msgstr ""
307332
308−#: qml/Shell.qml:283
333+#: qml/Shell.qml:345
309334msgid "Sorry, incorrect passcode"
310335msgstr ""
311336
312−#: qml/Shell.qml:273
337+#: qml/Shell.qml:348
313338#, qt-format
314−msgid "Enter your %1"
339+msgid "Enter %1"
315340msgstr ""
316341
317−#: qml/Shell.qml:274
342+#: qml/Shell.qml:349
318343#, qt-format
319344msgid "Sorry, incorrect %1"
320345msgstr ""
321346
322−#: qml/Shell.qml:310
347+#: qml/Shell.qml:384
323348msgid "Sorry, incorrect passphrase."
324349msgstr ""
325350
326−#: qml/Shell.qml:311
351+#: qml/Shell.qml:385
327352msgid "Sorry, incorrect passcode."
328353msgstr ""
329354
330−#: qml/Shell.qml:312
355+#: qml/Shell.qml:386
331356msgid "This will be your last attempt."
332357msgstr ""
333358
334−#: qml/Shell.qml:314
359+#: qml/Shell.qml:388
335360msgid ""
336361"If passphrase is entered incorrectly, your phone will conduct a factory "
337362"reset and all personal data will be deleted."
338363msgstr ""
339364
340−#: qml/Shell.qml:315
365+#: qml/Shell.qml:389
341366msgid ""
342367"If passcode is entered incorrectly, your phone will conduct a factory reset "
343368"and all personal data will be deleted."
po/hu.po+133−90
@@ -7,78 +7,104 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-26 18:24+0200\n"
11−"PO-Revision-Date: 2014-08-27 15:34+0000\n"
10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
11+"PO-Revision-Date: 2014-10-03 10:57+0000\n"
1212"Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n"
1313"Language-Team: Hungarian <hu@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-28 06:30+0000\n"
18−"X-Generator: Launchpad (build 17174)\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
18+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"
19+"X-Generator: Launchpad (build 17196)\n"
1920
20−#: plugins/LightDM/Greeter.cpp:129
21+#: plugins/LightDM/Greeter.cpp:130
2122msgid "Password: "
2223msgstr "Jelszó: "
2324
24−#: plugins/Unity/Launcher/launcheritem.cpp:43
25−#: plugins/Unity/Launcher/launcheritem.cpp:73
25+#: plugins/Unity/Launcher/launcheritem.cpp:45
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
2627msgid "Pin shortcut"
2728msgstr "Indító rögzítése"
2829
29−#: plugins/Unity/Launcher/launcheritem.cpp:73
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
3031msgid "Unpin shortcut"
3132msgstr "Indító feloldása"
3233
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr "Eszköz lezárva"
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr "A túl sok hibás jelmondat próbálkozás miatt le lett zárva az eszköz."
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr "A túl sok hibás jelkód próbálkozás miatt le lett zárva az eszköz."
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] "Kérjük várjon %1 percet és próbálja újra…"
51+msgstr[1] "Kérjük várjon %1 percet és próbálja újra…"
52+
3353#: qml/Components/Dialogs.qml:70
3454msgid "Log out"
35−msgstr ""
55+msgstr "Kijelentkezés"
3656
3757#: qml/Components/Dialogs.qml:71
3858msgid "Are you sure you want to log out?"
39−msgstr ""
59+msgstr "Biztos benne, hogy kijelentkezik?"
4060
4161#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97
4262#: qml/Components/Dialogs.qml:122
4363msgid "No"
44−msgstr ""
64+msgstr "Nem"
4565
4666#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104
4767#: qml/Components/Dialogs.qml:129
4868msgid "Yes"
49−msgstr ""
69+msgstr "Igen"
5070
5171#: qml/Components/Dialogs.qml:94
5272msgid "Shut down"
53−msgstr ""
73+msgstr "Leállítás"
5474
5575#: qml/Components/Dialogs.qml:95
5676msgid "Are you sure you want to shut down?"
57−msgstr ""
77+msgstr "Biztosan le szeretné állítani?"
5878
5979#: qml/Components/Dialogs.qml:119
6080msgid "Reboot"
61−msgstr ""
81+msgstr "Újraindítás"
6282
6383#: qml/Components/Dialogs.qml:120
6484msgid "Are you sure you want to reboot?"
65−msgstr ""
85+msgstr "Biztosan újra szeretné indítani?"
6686
6787#: qml/Components/Dialogs.qml:144
6888msgid "Power"
69−msgstr ""
89+msgstr "Kikapcsolás"
7090
7191#: qml/Components/Dialogs.qml:145
7292msgid ""
7393"Are you sure you would like\n"
7494"to power off?"
7595msgstr ""
96+"Biztos benne, hogy ki\n"
97+"szeretné kapcsolni?"
7698
77−#: qml/Components/Dialogs.qml:144
99+#: qml/Components/Dialogs.qml:147
78100msgid "Power off"
79101msgstr "Kikapcsolás"
80102
81−#: qml/Components/Dialogs.qml:162
103+#: qml/Components/Dialogs.qml:157
104+msgid "Restart"
105+msgstr "Újraindítás"
106+
107+#: qml/Components/Dialogs.qml:167
82108msgid "Cancel"
83109msgstr "Mégse"
84110
@@ -132,60 +158,44 @@ msgstr ""
132158"Elsajátította a gesztusokat, és megkezdheti a telefon "
133159"használatát.<br><br>Koppintson a képernyőre a kezdéshez."
134160
135−#: qml/Components/Lockscreen.qml:167
136−msgid "Please wait"
137−msgstr "Kérem várjon"
138−
139−#: qml/Components/Lockscreen.qml:172
140−msgid "Too many incorrect attempts"
141−msgstr "Túl sok sikertelen kísérlet"
142−
143−#: qml/Components/Lockscreen.qml:206
161+#: qml/Components/Lockscreen.qml:218
144162msgid "Emergency Call"
145163msgstr "Vészhívás"
146164
147−#: qml/Components/Lockscreen.qml:226
165+#: qml/Components/Lockscreen.qml:250
148166msgid "OK"
149167msgstr "Ok"
150168
151−#: qml/Components/PassphraseLockscreen.qml:61
152−#, qt-format
153−msgid "Hello %1"
154−msgstr "Üdv %1"
155−
156−#: qml/Components/PassphraseLockscreen.qml:61
157−msgid "Hello"
158−msgstr "Üdvözöljük"
159−
160−#: qml/Dash/GenericScopeView.qml:361
169+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
161170msgid "See less"
162171msgstr "Kevesebb"
163172
164−#: qml/Dash/GenericScopeView.qml:361
173+#: qml/Dash/GenericScopeView.qml:411
165174msgid "See all"
166175msgstr "Összes megtekintése"
167176
168−#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
177+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
178+#: qml/Panel/SearchIndicator.qml:27
169179msgid "Search"
170180msgstr "Keresés"
171181
172−#: qml/Dash/PageHeader.qml:270
182+#: qml/Dash/PageHeader.qml:268
173183msgid "Settings"
174−msgstr ""
184+msgstr "Beállítások"
175185
176−#: qml/Dash/PageHeader.qml:279
186+#: qml/Dash/PageHeader.qml:275
177187msgid "Remove from Favorites"
178−msgstr ""
188+msgstr "Eltávolítás a kedvencek közül"
179189
180−#: qml/Dash/PageHeader.qml:279
190+#: qml/Dash/PageHeader.qml:275
181191msgid "Add to Favorites"
182−msgstr ""
192+msgstr "Hozzáadás a kedvencekhez"
183193
184−#: qml/Dash/Previews/PreviewActionCombo.qml:34
194+#: qml/Dash/Previews/PreviewActionCombo.qml:35
185195msgid "More..."
186196msgstr "Több…"
187197
188−#: qml/Dash/Previews/PreviewActionCombo.qml:34
198+#: qml/Dash/Previews/PreviewActionCombo.qml:35
189199msgid "Less..."
190200msgstr "Kevesebb…"
191201
@@ -201,15 +211,23 @@ msgstr "Értékelés hozzáadása"
201211msgid "Send"
202212msgstr "Küldés"
203213
204−#: qml/Dash/ScopesOverview.qml:201
205−msgid "Manage Dash"
206−msgstr "Dash kezelése"
214+#: qml/Dash/PullToRefreshScopeStyle.qml:55
215+msgid "Pull to refresh…"
216+msgstr ""
217+
218+#: qml/Dash/PullToRefreshScopeStyle.qml:60
219+msgid "Release to refresh…"
220+msgstr ""
207221
208−#: qml/Dash/ScopesOverview.qml:408
222+#: qml/Dash/ScopesOverview.qml:206
223+msgid "Manage Scopes"
224+msgstr "Lencsék kezelése"
225+
226+#: qml/Dash/ScopesOverview.qml:428
209227msgid "Done"
210228msgstr "Kész"
211229
212−#: qml/Dash/ScopesOverview.qml:434
230+#: qml/Dash/ScopesOverview.qml:454
213231msgid "Store"
214232msgstr "Áruház"
215233
@@ -222,10 +240,10 @@ msgid "All"
222240msgstr "Összes"
223241
224242#: qml/Greeter/Greeter.qml:157
225−msgid "Swipe to unlock"
226−msgstr "Csúsztasson a feloldáshoz"
243+msgid "Unlock"
244+msgstr "Feloldás"
227245
228−#: qml/Hud/HudParametrizedActionsPage.qml:132
246+#: qml/Hud/HudParametrizedActionsPage.qml:139
229247msgid "Confirm"
230248msgstr "Megerősítés"
231249
@@ -245,15 +263,15 @@ msgstr "Most beszéljen…"
245263msgid "Speaking..."
246264msgstr "Beszéd…"
247265
248−#: qml/Notifications/NotificationMenuItemFactory.qml:105
266+#: qml/Notifications/NotificationMenuItemFactory.qml:108
249267msgid "Show password"
250268msgstr "Jelszó megjelenítése"
251269
252−#: qml/Notifications/NotificationMenuItemFactory.qml:120
270+#: qml/Notifications/NotificationMenuItemFactory.qml:124
253271msgid "Enter SIM PIN"
254272msgstr "Adja meg a SIM PIN kódját"
255273
256−#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
274+#: qml/Notifications/NotificationMenuItemFactory.qml:125
257275msgid "Sorry, incorrect PIN"
258276msgstr "Sajnáljuk, helytelen PIN"
259277
@@ -265,27 +283,31 @@ msgstr "Érintse meg, hogy visszatérjen a híváshoz..."
265283msgid "Conference"
266284msgstr "Konferencia"
267285
268−#: qml/Panel/Indicators/MenuItemFactory.qml:651
286+#: qml/Panel/Indicators/MenuItemFactory.qml:600
287+msgid "Nothing is playing"
288+msgstr "Nincs lejátszás"
289+
290+#: qml/Panel/Indicators/MenuItemFactory.qml:748
269291msgid "In queue…"
270292msgstr "Sorban…"
271293
272−#: qml/Panel/Indicators/MenuItemFactory.qml:655
294+#: qml/Panel/Indicators/MenuItemFactory.qml:752
273295msgid "Downloading"
274296msgstr "Letöltés"
275297
276−#: qml/Panel/Indicators/MenuItemFactory.qml:657
298+#: qml/Panel/Indicators/MenuItemFactory.qml:754
277299msgid "Paused, tap to resume"
278300msgstr "Szüneteltetve, koppintson a folytatáshoz"
279301
280−#: qml/Panel/Indicators/MenuItemFactory.qml:659
302+#: qml/Panel/Indicators/MenuItemFactory.qml:756
281303msgid "Canceled"
282304msgstr "Megszakítva"
283305
284−#: qml/Panel/Indicators/MenuItemFactory.qml:661
306+#: qml/Panel/Indicators/MenuItemFactory.qml:758
285307msgid "Finished"
286308msgstr "Befejeződött"
287309
288−#: qml/Panel/Indicators/MenuItemFactory.qml:663
310+#: qml/Panel/Indicators/MenuItemFactory.qml:760
289311msgid "Failed, tap to retry"
290312msgstr "Sikertelen, koppintson az újrapróbáláshoz"
291313
@@ -297,45 +319,49 @@ msgstr "SIM feloldása"
297319msgid "Roaming"
298320msgstr "Barangolás"
299321
300−#: qml/Shell.qml:266
301−msgid "Enter your passphrase"
302−msgstr "Adja meg a jelmondatot"
322+#: qml/Shell.qml:340
323+msgid "Enter passphrase"
324+msgstr "Jelmondat megadása"
303325
304−#: qml/Shell.qml:267
326+#: qml/Shell.qml:341
305327msgid "Sorry, incorrect passphrase"
306328msgstr "Sajnáljuk, helytelen jelmondat"
307329
308−#: qml/Shell.qml:282
309−msgid "Enter your passcode"
310−msgstr ""
330+#: qml/Shell.qml:342
331+msgid "Please re-enter"
332+msgstr "Kérjük adja meg újra"
333+
334+#: qml/Shell.qml:344
335+msgid "Enter passcode"
336+msgstr "Jelkód megadása"
311337
312−#: qml/Shell.qml:283
338+#: qml/Shell.qml:345
313339msgid "Sorry, incorrect passcode"
314−msgstr ""
340+msgstr "Sajnáljuk, helytelen jelkód"
315341
316−#: qml/Shell.qml:273
342+#: qml/Shell.qml:348
317343#, qt-format
318−msgid "Enter your %1"
319−msgstr "Kérjük adja meg: %1"
344+msgid "Enter %1"
345+msgstr "Adja meg: %1"
320346
321−#: qml/Shell.qml:274
347+#: qml/Shell.qml:349
322348#, qt-format
323349msgid "Sorry, incorrect %1"
324350msgstr "Sajnáljuk, helytelen %1"
325351
326−#: qml/Shell.qml:310
352+#: qml/Shell.qml:384
327353msgid "Sorry, incorrect passphrase."
328354msgstr "Sajnáljuk, helytelen jelmondat."
329355
330−#: qml/Shell.qml:311
356+#: qml/Shell.qml:385
331357msgid "Sorry, incorrect passcode."
332358msgstr "Sajnáljuk, helytelen jelkód."
333359
334−#: qml/Shell.qml:312
360+#: qml/Shell.qml:386
335361msgid "This will be your last attempt."
336362msgstr "Ez az utolsó próbálkozási lehetősége."
337363
338−#: qml/Shell.qml:314
364+#: qml/Shell.qml:388
339365msgid ""
340366"If passphrase is entered incorrectly, your phone will conduct a factory "
341367"reset and all personal data will be deleted."
@@ -343,7 +369,7 @@ msgstr ""
343369"Ha helytelen jelmondatot ad meg, a telefonja visszaállítja a gyári "
344370"beállításokat és törli minden személyes adatát."
345371
346−#: qml/Shell.qml:315
372+#: qml/Shell.qml:389
347373msgid ""
348374"If passcode is entered incorrectly, your phone will conduct a factory reset "
349375"and all personal data will be deleted."
@@ -351,11 +377,28 @@ msgstr ""
351377"Ha helytelen jelkódot ad meg, a telefonja visszaállítja a gyári "
352378"beállításokat és törli minden személyes adatát."
353379
354−#~ msgid "Restart"
355−#~ msgstr "Újraindítás"
380+#, qt-format
381+#~ msgid "Hello %1"
382+#~ msgstr "Üdv %1"
383+
384+#~ msgid "Swipe to unlock"
385+#~ msgstr "Csúsztasson a feloldáshoz"
356386
357−#~ msgid "Are you sure you would like to turn power off?"
358−#~ msgstr "Biztos benne, hogy ki szeretné kapcsolni?"
387+#~ msgid "Hello"
388+#~ msgstr "Üdvözöljük"
389+
390+#~ msgid "Please wait"
391+#~ msgstr "Kérem várjon"
392+
393+#~ msgid "Too many incorrect attempts"
394+#~ msgstr "Túl sok sikertelen kísérlet"
395+
396+#~ msgid "Enter your passphrase"
397+#~ msgstr "Adja meg a jelmondatot"
398+
399+#, qt-format
400+#~ msgid "Enter your %1"
401+#~ msgstr "Kérjük adja meg: %1"
359402
360−#~ msgid "Enter your PIN"
361−#~ msgstr "Adja meg a PIN kódot"
403+#~ msgid "Enter your passcode"
404+#~ msgstr "Adja meg a jelkódját"
po/hy.po+89−65
@@ -7,29 +7,49 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-26 18:24+0200\n"
10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
1111"PO-Revision-Date: 2013-06-27 04:43+0000\n"
1212"Last-Translator: iAbaS <sosabazyan@yandex.ru>\n"
1313"Language-Team: Armenian <hy@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-28 06:29+0000\n"
18−"X-Generator: Launchpad (build 17174)\n"
17+"Plural-Forms: nplurals=1; plural=0;\n"
18+"X-Launchpad-Export-Date: 2014-10-07 06:58+0000\n"
19+"X-Generator: Launchpad (build 17196)\n"
1920
20−#: plugins/LightDM/Greeter.cpp:129
21+#: plugins/LightDM/Greeter.cpp:130
2122msgid "Password: "
2223msgstr ""
2324
24−#: plugins/Unity/Launcher/launcheritem.cpp:43
25−#: plugins/Unity/Launcher/launcheritem.cpp:73
25+#: plugins/Unity/Launcher/launcheritem.cpp:45
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
2627msgid "Pin shortcut"
2728msgstr ""
2829
29−#: plugins/Unity/Launcher/launcheritem.cpp:73
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
3031msgid "Unpin shortcut"
3132msgstr ""
3233
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
3353#: qml/Components/Dialogs.qml:70
3454msgid "Log out"
3555msgstr ""
@@ -74,11 +94,15 @@ msgid ""
7494"to power off?"
7595msgstr ""
7696
77−#: qml/Components/Dialogs.qml:144
97+#: qml/Components/Dialogs.qml:147
7898msgid "Power off"
7999msgstr ""
80100
81−#: qml/Components/Dialogs.qml:162
101+#: qml/Components/Dialogs.qml:157
102+msgid "Restart"
103+msgstr ""
104+
105+#: qml/Components/Dialogs.qml:167
82106msgid "Cancel"
83107msgstr ""
84108
@@ -128,60 +152,44 @@ msgid ""
128152"phone<br><br>Tap on the screen to start"
129153msgstr ""
130154
131−#: qml/Components/Lockscreen.qml:167
132−msgid "Please wait"
133−msgstr ""
134−
135−#: qml/Components/Lockscreen.qml:172
136−msgid "Too many incorrect attempts"
137−msgstr ""
138−
139−#: qml/Components/Lockscreen.qml:206
155+#: qml/Components/Lockscreen.qml:218
140156msgid "Emergency Call"
141157msgstr ""
142158
143−#: qml/Components/Lockscreen.qml:226
159+#: qml/Components/Lockscreen.qml:250
144160msgid "OK"
145161msgstr ""
146162
147−#: qml/Components/PassphraseLockscreen.qml:61
148−#, qt-format
149−msgid "Hello %1"
150−msgstr ""
151−
152−#: qml/Components/PassphraseLockscreen.qml:61
153−msgid "Hello"
154−msgstr ""
155−
156−#: qml/Dash/GenericScopeView.qml:361
163+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
157164msgid "See less"
158165msgstr ""
159166
160−#: qml/Dash/GenericScopeView.qml:361
167+#: qml/Dash/GenericScopeView.qml:411
161168msgid "See all"
162169msgstr ""
163170
164−#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
171+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
172+#: qml/Panel/SearchIndicator.qml:27
165173msgid "Search"
166174msgstr "Որոնում"
167175
168−#: qml/Dash/PageHeader.qml:270
176+#: qml/Dash/PageHeader.qml:268
169177msgid "Settings"
170178msgstr ""
171179
172−#: qml/Dash/PageHeader.qml:279
180+#: qml/Dash/PageHeader.qml:275
173181msgid "Remove from Favorites"
174182msgstr ""
175183
176−#: qml/Dash/PageHeader.qml:279
184+#: qml/Dash/PageHeader.qml:275
177185msgid "Add to Favorites"
178186msgstr ""
179187
180−#: qml/Dash/Previews/PreviewActionCombo.qml:34
188+#: qml/Dash/Previews/PreviewActionCombo.qml:35
181189msgid "More..."
182190msgstr ""
183191
184−#: qml/Dash/Previews/PreviewActionCombo.qml:34
192+#: qml/Dash/Previews/PreviewActionCombo.qml:35
185193msgid "Less..."
186194msgstr ""
187195
@@ -197,15 +205,23 @@ msgstr ""
197205msgid "Send"
198206msgstr ""
199207
200−#: qml/Dash/ScopesOverview.qml:201
201−msgid "Manage Dash"
208+#: qml/Dash/PullToRefreshScopeStyle.qml:55
209+msgid "Pull to refresh…"
210+msgstr ""
211+
212+#: qml/Dash/PullToRefreshScopeStyle.qml:60
213+msgid "Release to refresh…"
214+msgstr ""
215+
216+#: qml/Dash/ScopesOverview.qml:206
217+msgid "Manage Scopes"
202218msgstr ""
203219
204−#: qml/Dash/ScopesOverview.qml:408
220+#: qml/Dash/ScopesOverview.qml:428
205221msgid "Done"
206222msgstr ""
207223
208−#: qml/Dash/ScopesOverview.qml:434
224+#: qml/Dash/ScopesOverview.qml:454
209225msgid "Store"
210226msgstr ""
211227
@@ -218,10 +234,10 @@ msgid "All"
218234msgstr ""
219235
220236#: qml/Greeter/Greeter.qml:157
221−msgid "Swipe to unlock"
237+msgid "Unlock"
222238msgstr ""
223239
224−#: qml/Hud/HudParametrizedActionsPage.qml:132
240+#: qml/Hud/HudParametrizedActionsPage.qml:139
225241msgid "Confirm"
226242msgstr "Հաստատել"
227243
@@ -241,15 +257,15 @@ msgstr "Խոսի՛ր"
241257msgid "Speaking..."
242258msgstr "Խոսում եմ..."
243259
244−#: qml/Notifications/NotificationMenuItemFactory.qml:105
260+#: qml/Notifications/NotificationMenuItemFactory.qml:108
245261msgid "Show password"
246262msgstr ""
247263
248−#: qml/Notifications/NotificationMenuItemFactory.qml:120
264+#: qml/Notifications/NotificationMenuItemFactory.qml:124
249265msgid "Enter SIM PIN"
250266msgstr ""
251267
252−#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
268+#: qml/Notifications/NotificationMenuItemFactory.qml:125
253269msgid "Sorry, incorrect PIN"
254270msgstr ""
255271
@@ -261,27 +277,31 @@ msgstr ""
261277msgid "Conference"
262278msgstr ""
263279
264−#: qml/Panel/Indicators/MenuItemFactory.qml:651
280+#: qml/Panel/Indicators/MenuItemFactory.qml:600
281+msgid "Nothing is playing"
282+msgstr ""
283+
284+#: qml/Panel/Indicators/MenuItemFactory.qml:748
265285msgid "In queue…"
266286msgstr ""
267287
268−#: qml/Panel/Indicators/MenuItemFactory.qml:655
288+#: qml/Panel/Indicators/MenuItemFactory.qml:752
269289msgid "Downloading"
270290msgstr ""
271291
272−#: qml/Panel/Indicators/MenuItemFactory.qml:657
292+#: qml/Panel/Indicators/MenuItemFactory.qml:754
273293msgid "Paused, tap to resume"
274294msgstr ""
275295
276−#: qml/Panel/Indicators/MenuItemFactory.qml:659
296+#: qml/Panel/Indicators/MenuItemFactory.qml:756
277297msgid "Canceled"
278298msgstr ""
279299
280−#: qml/Panel/Indicators/MenuItemFactory.qml:661
300+#: qml/Panel/Indicators/MenuItemFactory.qml:758
281301msgid "Finished"
282302msgstr ""
283303
284−#: qml/Panel/Indicators/MenuItemFactory.qml:663
304+#: qml/Panel/Indicators/MenuItemFactory.qml:760
285305msgid "Failed, tap to retry"
286306msgstr ""
287307
@@ -293,51 +313,55 @@ msgstr ""
293313msgid "Roaming"
294314msgstr ""
295315
296−#: qml/Shell.qml:266
297−msgid "Enter your passphrase"
316+#: qml/Shell.qml:340
317+msgid "Enter passphrase"
298318msgstr ""
299319
300−#: qml/Shell.qml:267
320+#: qml/Shell.qml:341
301321msgid "Sorry, incorrect passphrase"
302322msgstr ""
303323
304−#: qml/Shell.qml:282
305−msgid "Enter your passcode"
324+#: qml/Shell.qml:342
325+msgid "Please re-enter"
326+msgstr ""
327+
328+#: qml/Shell.qml:344
329+msgid "Enter passcode"
306330msgstr ""
307331
308−#: qml/Shell.qml:283
332+#: qml/Shell.qml:345
309333msgid "Sorry, incorrect passcode"
310334msgstr ""
311335
312−#: qml/Shell.qml:273
336+#: qml/Shell.qml:348
313337#, qt-format
314−msgid "Enter your %1"
338+msgid "Enter %1"
315339msgstr ""
316340
317−#: qml/Shell.qml:274
341+#: qml/Shell.qml:349
318342#, qt-format
319343msgid "Sorry, incorrect %1"
320344msgstr ""
321345
322−#: qml/Shell.qml:310
346+#: qml/Shell.qml:384
323347msgid "Sorry, incorrect passphrase."
324348msgstr ""
325349
326−#: qml/Shell.qml:311
350+#: qml/Shell.qml:385
327351msgid "Sorry, incorrect passcode."
328352msgstr ""
329353
330−#: qml/Shell.qml:312
354+#: qml/Shell.qml:386
331355msgid "This will be your last attempt."
332356msgstr ""
333357
334−#: qml/Shell.qml:314
358+#: qml/Shell.qml:388
335359msgid ""
336360"If passphrase is entered incorrectly, your phone will conduct a factory "
337361"reset and all personal data will be deleted."
338362msgstr ""
339363
340−#: qml/Shell.qml:315
364+#: qml/Shell.qml:389
341365msgid ""
342366"If passcode is entered incorrectly, your phone will conduct a factory reset "
343367"and all personal data will be deleted."
po/id.po+89−65
@@ -7,29 +7,49 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-26 18:24+0200\n"
10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
1111"PO-Revision-Date: 2013-06-26 22:35+0000\n"
1212"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1313"Language-Team: Indonesian <id@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-28 06:30+0000\n"
18−"X-Generator: Launchpad (build 17174)\n"
17+"Plural-Forms: nplurals=1; plural=0;\n"
18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"
19+"X-Generator: Launchpad (build 17196)\n"
1920
20−#: plugins/LightDM/Greeter.cpp:129
21+#: plugins/LightDM/Greeter.cpp:130
2122msgid "Password: "
2223msgstr ""
2324
24−#: plugins/Unity/Launcher/launcheritem.cpp:43
25−#: plugins/Unity/Launcher/launcheritem.cpp:73
25+#: plugins/Unity/Launcher/launcheritem.cpp:45
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
2627msgid "Pin shortcut"
2728msgstr ""
2829
29−#: plugins/Unity/Launcher/launcheritem.cpp:73
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
3031msgid "Unpin shortcut"
3132msgstr ""
3233
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
3353#: qml/Components/Dialogs.qml:70
3454msgid "Log out"
3555msgstr ""
@@ -74,11 +94,15 @@ msgid ""
7494"to power off?"
7595msgstr ""
7696
77−#: qml/Components/Dialogs.qml:144
97+#: qml/Components/Dialogs.qml:147
7898msgid "Power off"
7999msgstr ""
80100
81−#: qml/Components/Dialogs.qml:162
101+#: qml/Components/Dialogs.qml:157
102+msgid "Restart"
103+msgstr ""
104+
105+#: qml/Components/Dialogs.qml:167
82106msgid "Cancel"
83107msgstr ""
84108
@@ -128,60 +152,44 @@ msgid ""
128152"phone<br><br>Tap on the screen to start"
129153msgstr ""
130154
131−#: qml/Components/Lockscreen.qml:167
132−msgid "Please wait"
133−msgstr ""
134−
135−#: qml/Components/Lockscreen.qml:172
136−msgid "Too many incorrect attempts"
137−msgstr ""
138−
139−#: qml/Components/Lockscreen.qml:206
155+#: qml/Components/Lockscreen.qml:218
140156msgid "Emergency Call"
141157msgstr ""
142158
143−#: qml/Components/Lockscreen.qml:226
159+#: qml/Components/Lockscreen.qml:250
144160msgid "OK"
145161msgstr ""
146162
147−#: qml/Components/PassphraseLockscreen.qml:61
148−#, qt-format
149−msgid "Hello %1"
150−msgstr ""
151−
152−#: qml/Components/PassphraseLockscreen.qml:61
153−msgid "Hello"
154−msgstr ""
155−
156−#: qml/Dash/GenericScopeView.qml:361
163+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
157164msgid "See less"
158165msgstr ""
159166
160−#: qml/Dash/GenericScopeView.qml:361
167+#: qml/Dash/GenericScopeView.qml:411
161168msgid "See all"
162169msgstr ""
163170
164−#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
171+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
172+#: qml/Panel/SearchIndicator.qml:27
165173msgid "Search"
166174msgstr ""
167175
168−#: qml/Dash/PageHeader.qml:270
176+#: qml/Dash/PageHeader.qml:268
169177msgid "Settings"
170178msgstr ""
171179
172−#: qml/Dash/PageHeader.qml:279
180+#: qml/Dash/PageHeader.qml:275
173181msgid "Remove from Favorites"
174182msgstr ""
175183
176−#: qml/Dash/PageHeader.qml:279
184+#: qml/Dash/PageHeader.qml:275
177185msgid "Add to Favorites"
178186msgstr ""
179187
180−#: qml/Dash/Previews/PreviewActionCombo.qml:34
188+#: qml/Dash/Previews/PreviewActionCombo.qml:35
181189msgid "More..."
182190msgstr ""
183191
184−#: qml/Dash/Previews/PreviewActionCombo.qml:34
192+#: qml/Dash/Previews/PreviewActionCombo.qml:35
185193msgid "Less..."
186194msgstr ""
187195
@@ -197,15 +205,23 @@ msgstr ""
197205msgid "Send"
198206msgstr ""
199207
200−#: qml/Dash/ScopesOverview.qml:201
201−msgid "Manage Dash"
208+#: qml/Dash/PullToRefreshScopeStyle.qml:55
209+msgid "Pull to refresh…"
210+msgstr ""
211+
212+#: qml/Dash/PullToRefreshScopeStyle.qml:60
213+msgid "Release to refresh…"
214+msgstr ""
215+
216+#: qml/Dash/ScopesOverview.qml:206
217+msgid "Manage Scopes"
202218msgstr ""
203219
204−#: qml/Dash/ScopesOverview.qml:408
220+#: qml/Dash/ScopesOverview.qml:428
205221msgid "Done"
206222msgstr ""
207223
208−#: qml/Dash/ScopesOverview.qml:434
224+#: qml/Dash/ScopesOverview.qml:454
209225msgid "Store"
210226msgstr ""
211227
@@ -218,10 +234,10 @@ msgid "All"
218234msgstr ""
219235
220236#: qml/Greeter/Greeter.qml:157
221−msgid "Swipe to unlock"
237+msgid "Unlock"
222238msgstr ""
223239
224−#: qml/Hud/HudParametrizedActionsPage.qml:132
240+#: qml/Hud/HudParametrizedActionsPage.qml:139
225241msgid "Confirm"
226242msgstr ""
227243
@@ -241,15 +257,15 @@ msgstr ""
241257msgid "Speaking..."
242258msgstr ""
243259
244−#: qml/Notifications/NotificationMenuItemFactory.qml:105
260+#: qml/Notifications/NotificationMenuItemFactory.qml:108
245261msgid "Show password"
246262msgstr ""
247263
248−#: qml/Notifications/NotificationMenuItemFactory.qml:120
264+#: qml/Notifications/NotificationMenuItemFactory.qml:124
249265msgid "Enter SIM PIN"
250266msgstr ""
251267
252−#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
268+#: qml/Notifications/NotificationMenuItemFactory.qml:125
253269msgid "Sorry, incorrect PIN"
254270msgstr ""
255271
@@ -261,27 +277,31 @@ msgstr ""
261277msgid "Conference"
262278msgstr ""
263279
264−#: qml/Panel/Indicators/MenuItemFactory.qml:651
280+#: qml/Panel/Indicators/MenuItemFactory.qml:600
281+msgid "Nothing is playing"
282+msgstr ""
283+
284+#: qml/Panel/Indicators/MenuItemFactory.qml:748
265285msgid "In queue…"
266286msgstr ""
267287
268−#: qml/Panel/Indicators/MenuItemFactory.qml:655
288+#: qml/Panel/Indicators/MenuItemFactory.qml:752
269289msgid "Downloading"
270290msgstr ""
271291
272−#: qml/Panel/Indicators/MenuItemFactory.qml:657
292+#: qml/Panel/Indicators/MenuItemFactory.qml:754
273293msgid "Paused, tap to resume"
274294msgstr ""
275295
276−#: qml/Panel/Indicators/MenuItemFactory.qml:659
296+#: qml/Panel/Indicators/MenuItemFactory.qml:756
277297msgid "Canceled"
278298msgstr ""
279299
280−#: qml/Panel/Indicators/MenuItemFactory.qml:661
300+#: qml/Panel/Indicators/MenuItemFactory.qml:758
281301msgid "Finished"
282302msgstr ""
283303
284−#: qml/Panel/Indicators/MenuItemFactory.qml:663
304+#: qml/Panel/Indicators/MenuItemFactory.qml:760
285305msgid "Failed, tap to retry"
286306msgstr ""
287307
@@ -293,51 +313,55 @@ msgstr ""
293313msgid "Roaming"
294314msgstr ""
295315
296−#: qml/Shell.qml:266
297−msgid "Enter your passphrase"
316+#: qml/Shell.qml:340
317+msgid "Enter passphrase"
298318msgstr ""
299319
300−#: qml/Shell.qml:267
320+#: qml/Shell.qml:341
301321msgid "Sorry, incorrect passphrase"
302322msgstr ""
303323
304−#: qml/Shell.qml:282
305−msgid "Enter your passcode"
324+#: qml/Shell.qml:342
325+msgid "Please re-enter"
326+msgstr ""
327+
328+#: qml/Shell.qml:344
329+msgid "Enter passcode"
306330msgstr ""
307331
308−#: qml/Shell.qml:283
332+#: qml/Shell.qml:345
309333msgid "Sorry, incorrect passcode"
310334msgstr ""
311335
312−#: qml/Shell.qml:273
336+#: qml/Shell.qml:348
313337#, qt-format
314−msgid "Enter your %1"
338+msgid "Enter %1"
315339msgstr ""
316340
317−#: qml/Shell.qml:274
341+#: qml/Shell.qml:349
318342#, qt-format
319343msgid "Sorry, incorrect %1"
320344msgstr ""
321345
322−#: qml/Shell.qml:310
346+#: qml/Shell.qml:384
323347msgid "Sorry, incorrect passphrase."
324348msgstr ""
325349
326−#: qml/Shell.qml:311
350+#: qml/Shell.qml:385
327351msgid "Sorry, incorrect passcode."
328352msgstr ""
329353
330−#: qml/Shell.qml:312
354+#: qml/Shell.qml:386
331355msgid "This will be your last attempt."
332356msgstr ""
333357
334−#: qml/Shell.qml:314
358+#: qml/Shell.qml:388
335359msgid ""
336360"If passphrase is entered incorrectly, your phone will conduct a factory "
337361"reset and all personal data will be deleted."
338362msgstr ""
339363
340−#: qml/Shell.qml:315
364+#: qml/Shell.qml:389
341365msgid ""
342366"If passcode is entered incorrectly, your phone will conduct a factory reset "
343367"and all personal data will be deleted."
po/is.po+151−95
@@ -9,81 +9,107 @@ msgid ""
99msgstr ""
1010"Project-Id-Version: po_unity8-is\n"
1111"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
12−"POT-Creation-Date: 2014-08-26 18:24+0200\n"
13−"PO-Revision-Date: 2014-07-31 16:10+0000\n"
12+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
13+"PO-Revision-Date: 2014-10-05 08:44+0000\n"
1414"Last-Translator: Sveinn í Felli <sv1@fellsnet.is>\n"
1515"Language-Team: Icelandic <translation-team-is@lists.sourceforge.net>\n"
1616"MIME-Version: 1.0\n"
1717"Content-Type: text/plain; charset=UTF-8\n"
1818"Content-Transfer-Encoding: 8bit\n"
19−"X-Launchpad-Export-Date: 2014-08-28 06:30+0000\n"
20−"X-Generator: Launchpad (build 17174)\n"
19+"Plural-Forms: nplurals=2; plural=n != 1;\n"
20+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"
21+"X-Generator: Launchpad (build 17196)\n"
2122"Language: is\n"
2223
23−#: plugins/LightDM/Greeter.cpp:129
24+#: plugins/LightDM/Greeter.cpp:130
2425msgid "Password: "
25−msgstr ""
26+msgstr "Lykilorð: "
2627
27−#: plugins/Unity/Launcher/launcheritem.cpp:43
28−#: plugins/Unity/Launcher/launcheritem.cpp:73
28+#: plugins/Unity/Launcher/launcheritem.cpp:45
29+#: plugins/Unity/Launcher/launcheritem.cpp:91
2930msgid "Pin shortcut"
3031msgstr "Pinna flýtilykil"
3132
32−#: plugins/Unity/Launcher/launcheritem.cpp:73
33+#: plugins/Unity/Launcher/launcheritem.cpp:91
3334msgid "Unpin shortcut"
3435msgstr "Losa flýtilykil"
3536
37+#: qml/Components/DelayedLockscreen.qml:47
38+msgid "Device Locked"
39+msgstr ""
40+
41+#: qml/Components/DelayedLockscreen.qml:62
42+msgid "You have been locked out due to too many failed passphrase attempts."
43+msgstr ""
44+
45+#: qml/Components/DelayedLockscreen.qml:63
46+msgid "You have been locked out due to too many failed passcode attempts."
47+msgstr ""
48+
49+#: qml/Components/DelayedLockscreen.qml:72
50+#, qt-format
51+msgid "Please wait %1 minute and then try again…"
52+msgid_plural "Please wait %1 minutes and then try again…"
53+msgstr[0] ""
54+msgstr[1] ""
55+
3656#: qml/Components/Dialogs.qml:70
3757msgid "Log out"
38−msgstr ""
58+msgstr "Útskráning"
3959
4060#: qml/Components/Dialogs.qml:71
4161msgid "Are you sure you want to log out?"
42−msgstr ""
62+msgstr "Ertu viss um að þú viljir skrá þig út?"
4363
4464#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97
4565#: qml/Components/Dialogs.qml:122
4666msgid "No"
47−msgstr ""
67+msgstr "Nei"
4868
4969#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104
5070#: qml/Components/Dialogs.qml:129
5171msgid "Yes"
52−msgstr ""
72+msgstr "Já"
5373
5474#: qml/Components/Dialogs.qml:94
5575msgid "Shut down"
56−msgstr ""
76+msgstr "Slökkva á tölvunni"
5777
5878#: qml/Components/Dialogs.qml:95
5979msgid "Are you sure you want to shut down?"
60−msgstr ""
80+msgstr "Ertu viss um að þú viljir slökkva á símanum?"
6181
6282#: qml/Components/Dialogs.qml:119
6383msgid "Reboot"
64−msgstr ""
84+msgstr "Endurræsa"
6585
6686#: qml/Components/Dialogs.qml:120
6787msgid "Are you sure you want to reboot?"
68−msgstr ""
88+msgstr "Ertu viss að þú viljir enduræsa?"
6989
7090#: qml/Components/Dialogs.qml:144
7191msgid "Power"
72−msgstr ""
92+msgstr "Aflstjórnun"
7393
7494#: qml/Components/Dialogs.qml:145
7595msgid ""
7696"Are you sure you would like\n"
7797"to power off?"
7898msgstr ""
99+"Ertu viss um að þú viljir\n"
100+"slökkva á símanum?"
79101
80−#: qml/Components/Dialogs.qml:144
102+#: qml/Components/Dialogs.qml:147
81103msgid "Power off"
82−msgstr ""
104+msgstr "Slökkva"
83105
84−#: qml/Components/Dialogs.qml:162
106+#: qml/Components/Dialogs.qml:157
107+msgid "Restart"
108+msgstr "Endurræsa"
109+
110+#: qml/Components/Dialogs.qml:167
85111msgid "Cancel"
86−msgstr ""
112+msgstr "Hætta við"
87113
88114#: qml/Components/EdgeDemoOverlay.qml:151
89115msgid "Skip intro"
@@ -134,60 +160,44 @@ msgstr ""
134160"Þú ert núna með æfingu í að nota skjáhreyfingar og getur því farið að nota "
135161"símann<br><br>Sláðu létt á skjáinn til að byrja"
136162
137−#: qml/Components/Lockscreen.qml:167
138−msgid "Please wait"
139−msgstr ""
140−
141−#: qml/Components/Lockscreen.qml:172
142−msgid "Too many incorrect attempts"
143−msgstr ""
144−
145−#: qml/Components/Lockscreen.qml:206
163+#: qml/Components/Lockscreen.qml:218
146164msgid "Emergency Call"
147165msgstr "Neyðarsímtal"
148166
149−#: qml/Components/Lockscreen.qml:226
167+#: qml/Components/Lockscreen.qml:250
150168msgid "OK"
151169msgstr "Í lagi"
152170
153−#: qml/Components/PassphraseLockscreen.qml:61
154−#, qt-format
155−msgid "Hello %1"
156−msgstr "Hæ %1"
157−
158−#: qml/Components/PassphraseLockscreen.qml:61
159−msgid "Hello"
160−msgstr "Hæ"
161−
162−#: qml/Dash/GenericScopeView.qml:361
171+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
163172msgid "See less"
164173msgstr "Sjá minna"
165174
166−#: qml/Dash/GenericScopeView.qml:361
175+#: qml/Dash/GenericScopeView.qml:411
167176msgid "See all"
168177msgstr "Sjá allt"
169178
170−#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
179+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
180+#: qml/Panel/SearchIndicator.qml:27
171181msgid "Search"
172182msgstr "Leita"
173183
174−#: qml/Dash/PageHeader.qml:270
184+#: qml/Dash/PageHeader.qml:268
175185msgid "Settings"
176−msgstr ""
186+msgstr "Stillingar"
177187
178−#: qml/Dash/PageHeader.qml:279
188+#: qml/Dash/PageHeader.qml:275
179189msgid "Remove from Favorites"
180−msgstr ""
190+msgstr "Fjarlægja úr Eftirlæti"
181191
182−#: qml/Dash/PageHeader.qml:279
192+#: qml/Dash/PageHeader.qml:275
183193msgid "Add to Favorites"
184−msgstr ""
194+msgstr "Bæta við Eftirlæti"
185195
186−#: qml/Dash/Previews/PreviewActionCombo.qml:34
196+#: qml/Dash/Previews/PreviewActionCombo.qml:35
187197msgid "More..."
188198msgstr "Meira..."
189199
190−#: qml/Dash/Previews/PreviewActionCombo.qml:34
200+#: qml/Dash/Previews/PreviewActionCombo.qml:35
191201msgid "Less..."
192202msgstr "Minna..."
193203
@@ -203,31 +213,39 @@ msgstr "Gefa umsögn"
203213msgid "Send"
204214msgstr "Senda"
205215
206−#: qml/Dash/ScopesOverview.qml:201
207−msgid "Manage Dash"
216+#: qml/Dash/PullToRefreshScopeStyle.qml:55
217+msgid "Pull to refresh…"
208218msgstr ""
209219
210−#: qml/Dash/ScopesOverview.qml:408
211−msgid "Done"
220+#: qml/Dash/PullToRefreshScopeStyle.qml:60
221+msgid "Release to refresh…"
212222msgstr ""
213223
214−#: qml/Dash/ScopesOverview.qml:434
215−msgid "Store"
224+#: qml/Dash/ScopesOverview.qml:206
225+msgid "Manage Scopes"
216226msgstr ""
217227
228+#: qml/Dash/ScopesOverview.qml:428
229+msgid "Done"
230+msgstr "Lokið"
231+
232+#: qml/Dash/ScopesOverview.qml:454
233+msgid "Store"
234+msgstr "Geyma"
235+
218236#: qml/Dash/ScopesOverviewTab.qml:36
219237msgid "Favorites"
220−msgstr ""
238+msgstr "Eftirlæti"
221239
222240#: qml/Dash/ScopesOverviewTab.qml:54
223241msgid "All"
224−msgstr ""
242+msgstr "Allt"
225243
226244#: qml/Greeter/Greeter.qml:157
227−msgid "Swipe to unlock"
228−msgstr "Strjúka til að aflæsa"
245+msgid "Unlock"
246+msgstr ""
229247
230−#: qml/Hud/HudParametrizedActionsPage.qml:132
248+#: qml/Hud/HudParametrizedActionsPage.qml:139
231249msgid "Confirm"
232250msgstr "Staðfesta"
233251
@@ -247,17 +265,17 @@ msgstr "Tala núna..."
247265msgid "Speaking..."
248266msgstr "Tala..."
249267
250−#: qml/Notifications/NotificationMenuItemFactory.qml:105
268+#: qml/Notifications/NotificationMenuItemFactory.qml:108
251269msgid "Show password"
252270msgstr "Birta lykilorð"
253271
254−#: qml/Notifications/NotificationMenuItemFactory.qml:120
272+#: qml/Notifications/NotificationMenuItemFactory.qml:124
255273msgid "Enter SIM PIN"
256−msgstr ""
274+msgstr "Settu inn PIN-númer SIM-kortsins"
257275
258−#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
276+#: qml/Notifications/NotificationMenuItemFactory.qml:125
259277msgid "Sorry, incorrect PIN"
260−msgstr ""
278+msgstr "Því miður, rangt PIN-númer"
261279
262280#: qml/Panel/ActiveCallHint.qml:77
263281msgid "Tap to return to call..."
@@ -267,84 +285,122 @@ msgstr "Slá til að svara símtali..."
267285msgid "Conference"
268286msgstr "Ráðstefna"
269287
270−#: qml/Panel/Indicators/MenuItemFactory.qml:651
288+#: qml/Panel/Indicators/MenuItemFactory.qml:600
289+msgid "Nothing is playing"
290+msgstr ""
291+
292+#: qml/Panel/Indicators/MenuItemFactory.qml:748
271293msgid "In queue…"
272294msgstr "Í biðröð..."
273295
274−#: qml/Panel/Indicators/MenuItemFactory.qml:655
296+#: qml/Panel/Indicators/MenuItemFactory.qml:752
275297msgid "Downloading"
276298msgstr "Sæki"
277299
278−#: qml/Panel/Indicators/MenuItemFactory.qml:657
300+#: qml/Panel/Indicators/MenuItemFactory.qml:754
279301msgid "Paused, tap to resume"
280302msgstr "Í bið, sláðu létt til að halda áfram"
281303
282−#: qml/Panel/Indicators/MenuItemFactory.qml:659
304+#: qml/Panel/Indicators/MenuItemFactory.qml:756
283305msgid "Canceled"
284306msgstr "Hætt við"
285307
286−#: qml/Panel/Indicators/MenuItemFactory.qml:661
308+#: qml/Panel/Indicators/MenuItemFactory.qml:758
287309msgid "Finished"
288310msgstr "Lokið"
289311
290−#: qml/Panel/Indicators/MenuItemFactory.qml:663
312+#: qml/Panel/Indicators/MenuItemFactory.qml:760
291313msgid "Failed, tap to retry"
292314msgstr "Mistókst, sláðu létt til að reyna aftur"
293315
294316#: qml/Panel/Indicators/ModemInfoItem.qml:105
295317msgid "Unlock SIM"
296−msgstr ""
318+msgstr "Aflæsa SIM-korti"
297319
298320#: qml/Panel/Indicators/RoamingIndication.qml:27
299321msgid "Roaming"
300−msgstr ""
322+msgstr "Ráphamur"
301323
302−#: qml/Shell.qml:266
303−msgid "Enter your passphrase"
324+#: qml/Shell.qml:340
325+msgid "Enter passphrase"
304326msgstr ""
305327
306−#: qml/Shell.qml:267
328+#: qml/Shell.qml:341
307329msgid "Sorry, incorrect passphrase"
330+msgstr "Því miður, rangt lykilorð"
331+
332+#: qml/Shell.qml:342
333+msgid "Please re-enter"
308334msgstr ""
309335
310−#: qml/Shell.qml:282
311−msgid "Enter your passcode"
336+#: qml/Shell.qml:344
337+msgid "Enter passcode"
312338msgstr ""
313339
314−#: qml/Shell.qml:283
340+#: qml/Shell.qml:345
315341msgid "Sorry, incorrect passcode"
316−msgstr ""
342+msgstr "Því miður, rangur aðgangskóði"
317343
318−#: qml/Shell.qml:273
344+#: qml/Shell.qml:348
319345#, qt-format
320−msgid "Enter your %1"
346+msgid "Enter %1"
321347msgstr ""
322348
323−#: qml/Shell.qml:274
349+#: qml/Shell.qml:349
324350#, qt-format
325351msgid "Sorry, incorrect %1"
326−msgstr ""
352+msgstr "Því miður, rangt %1"
327353
328−#: qml/Shell.qml:310
354+#: qml/Shell.qml:384
329355msgid "Sorry, incorrect passphrase."
330−msgstr ""
356+msgstr "Því miður, rangt lykilorð."
331357
332−#: qml/Shell.qml:311
358+#: qml/Shell.qml:385
333359msgid "Sorry, incorrect passcode."
334−msgstr ""
360+msgstr "Því miður, rangur aðgangskóði."
335361
336−#: qml/Shell.qml:312
362+#: qml/Shell.qml:386
337363msgid "This will be your last attempt."
338−msgstr ""
364+msgstr "Þetta mun verða síðasta tilraunin þín."
339365
340−#: qml/Shell.qml:314
366+#: qml/Shell.qml:388
341367msgid ""
342368"If passphrase is entered incorrectly, your phone will conduct a factory "
343369"reset and all personal data will be deleted."
344370msgstr ""
371+"Ef lykilorð er rangt, mun síminn frumstilla allt á verksmiðjustillingar og "
372+"öllum einkagögnum verður eytt."
345373
346−#: qml/Shell.qml:315
374+#: qml/Shell.qml:389
347375msgid ""
348376"If passcode is entered incorrectly, your phone will conduct a factory reset "
349377"and all personal data will be deleted."
350378msgstr ""
379+"Ef aðgangskóði er rangur, mun síminn frumstilla allt á verksmiðjustillingar "
380+"og öllum einkagögnum verður eytt."
381+
382+#, qt-format
383+#~ msgid "Hello %1"
384+#~ msgstr "Hæ %1"
385+
386+#~ msgid "Hello"
387+#~ msgstr "Hæ"
388+
389+#~ msgid "Swipe to unlock"
390+#~ msgstr "Strjúka til að aflæsa"
391+
392+#~ msgid "Please wait"
393+#~ msgstr "Bíddu aðeins"
394+
395+#~ msgid "Too many incorrect attempts"
396+#~ msgstr "Of margar rangar tilraunir"
397+
398+#~ msgid "Enter your passphrase"
399+#~ msgstr "Sláðu inn lykilorðið þitt"
400+
401+#~ msgid "Enter your passcode"
402+#~ msgstr "Settu inn aðgangskóðann þinn"
403+
404+#, qt-format
405+#~ msgid "Enter your %1"
406+#~ msgstr "Settu inn %1"
po/it.po+132−89
@@ -7,78 +7,104 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-26 18:24+0200\n"
11−"PO-Revision-Date: 2014-08-23 07:47+0000\n"
10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
11+"PO-Revision-Date: 2014-09-30 10:56+0000\n"
1212"Last-Translator: Claudio Arseni <claudio.arseni@gmail.com>\n"
1313"Language-Team: Italian <it@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-28 06:30+0000\n"
18−"X-Generator: Launchpad (build 17174)\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"
19+"X-Generator: Launchpad (build 17196)\n"
1920
20−#: plugins/LightDM/Greeter.cpp:129
21+#: plugins/LightDM/Greeter.cpp:130
2122msgid "Password: "
2223msgstr "Password: "
2324
24−#: plugins/Unity/Launcher/launcheritem.cpp:43
25−#: plugins/Unity/Launcher/launcheritem.cpp:73
25+#: plugins/Unity/Launcher/launcheritem.cpp:45
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
2627msgid "Pin shortcut"
2728msgstr "Blocca scorciatoia"
2829
29−#: plugins/Unity/Launcher/launcheritem.cpp:73
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
3031msgid "Unpin shortcut"
3132msgstr "Sblocca scorciatoia"
3233
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
3353#: qml/Components/Dialogs.qml:70
3454msgid "Log out"
35−msgstr ""
55+msgstr "Termina sessione"
3656
3757#: qml/Components/Dialogs.qml:71
3858msgid "Are you sure you want to log out?"
39−msgstr ""
59+msgstr "Terminare veramente la sessione?"
4060
4161#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97
4262#: qml/Components/Dialogs.qml:122
4363msgid "No"
44−msgstr ""
64+msgstr "No"
4565
4666#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104
4767#: qml/Components/Dialogs.qml:129
4868msgid "Yes"
49−msgstr ""
69+msgstr "Sì"
5070
5171#: qml/Components/Dialogs.qml:94
5272msgid "Shut down"
53−msgstr ""
73+msgstr "Spegni"
5474
5575#: qml/Components/Dialogs.qml:95
5676msgid "Are you sure you want to shut down?"
57−msgstr ""
77+msgstr "Spegnere veramente il dispositivo?"
5878
5979#: qml/Components/Dialogs.qml:119
6080msgid "Reboot"
61−msgstr ""
81+msgstr "Riavvia"
6282
6383#: qml/Components/Dialogs.qml:120
6484msgid "Are you sure you want to reboot?"
65−msgstr ""
85+msgstr "Riavviare veramente il dispositivo?"
6686
6787#: qml/Components/Dialogs.qml:144
6888msgid "Power"
69−msgstr ""
89+msgstr "Alimentazione"
7090
7191#: qml/Components/Dialogs.qml:145
7292msgid ""
7393"Are you sure you would like\n"
7494"to power off?"
7595msgstr ""
96+"Spegnere veramente\n"
97+"il dispositivo?"
7698
77−#: qml/Components/Dialogs.qml:144
99+#: qml/Components/Dialogs.qml:147
78100msgid "Power off"
79101msgstr "Spegni"
80102
81−#: qml/Components/Dialogs.qml:162
103+#: qml/Components/Dialogs.qml:157
104+msgid "Restart"
105+msgstr "Riavvia"
106+
107+#: qml/Components/Dialogs.qml:167
82108msgid "Cancel"
83109msgstr "Annulla"
84110
@@ -135,60 +161,44 @@ msgstr ""
135161"L'apprendimento dei gesti è stato completato. È ora possibile iniziare a "
136162"usare il telefono.<br><br>Toccare lo schermo per iniziare"
137163
138−#: qml/Components/Lockscreen.qml:167
139−msgid "Please wait"
140−msgstr "Attendere"
141−
142−#: qml/Components/Lockscreen.qml:172
143−msgid "Too many incorrect attempts"
144−msgstr "Troppi tentativi errati"
145−
146−#: qml/Components/Lockscreen.qml:206
164+#: qml/Components/Lockscreen.qml:218
147165msgid "Emergency Call"
148166msgstr "Chiamata di emergenza"
149167
150−#: qml/Components/Lockscreen.qml:226
168+#: qml/Components/Lockscreen.qml:250
151169msgid "OK"
152170msgstr "OK"
153171
154−#: qml/Components/PassphraseLockscreen.qml:61
155−#, qt-format
156−msgid "Hello %1"
157−msgstr "Ciao %1"
158−
159−#: qml/Components/PassphraseLockscreen.qml:61
160−msgid "Hello"
161−msgstr "Ciao"
162−
163−#: qml/Dash/GenericScopeView.qml:361
172+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
164173msgid "See less"
165174msgstr "Mostra meno"
166175
167−#: qml/Dash/GenericScopeView.qml:361
176+#: qml/Dash/GenericScopeView.qml:411
168177msgid "See all"
169178msgstr "Mostra tutto"
170179
171−#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
180+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
181+#: qml/Panel/SearchIndicator.qml:27
172182msgid "Search"
173183msgstr "Cerca"
174184
175−#: qml/Dash/PageHeader.qml:270
185+#: qml/Dash/PageHeader.qml:268
176186msgid "Settings"
177−msgstr ""
187+msgstr "Impostazioni"
178188
179−#: qml/Dash/PageHeader.qml:279
189+#: qml/Dash/PageHeader.qml:275
180190msgid "Remove from Favorites"
181−msgstr ""
191+msgstr "Rimuovi dai preferiti"
182192
183−#: qml/Dash/PageHeader.qml:279
193+#: qml/Dash/PageHeader.qml:275
184194msgid "Add to Favorites"
185−msgstr ""
195+msgstr "Aggiungi ai preferiti"
186196
187−#: qml/Dash/Previews/PreviewActionCombo.qml:34
197+#: qml/Dash/Previews/PreviewActionCombo.qml:35
188198msgid "More..."
189199msgstr "Altro..."
190200
191−#: qml/Dash/Previews/PreviewActionCombo.qml:34
201+#: qml/Dash/Previews/PreviewActionCombo.qml:35
192202msgid "Less..."
193203msgstr "Meno..."
194204
@@ -204,15 +214,23 @@ msgstr "Aggiungi una recensione"
204214msgid "Send"
205215msgstr "Invia"
206216
207−#: qml/Dash/ScopesOverview.qml:201
208−msgid "Manage Dash"
209−msgstr "Gestione della Dash"
217+#: qml/Dash/PullToRefreshScopeStyle.qml:55
218+msgid "Pull to refresh…"
219+msgstr ""
220+
221+#: qml/Dash/PullToRefreshScopeStyle.qml:60
222+msgid "Release to refresh…"
223+msgstr ""
224+
225+#: qml/Dash/ScopesOverview.qml:206
226+msgid "Manage Scopes"
227+msgstr "Gestisci Scope"
210228
211−#: qml/Dash/ScopesOverview.qml:408
229+#: qml/Dash/ScopesOverview.qml:428
212230msgid "Done"
213231msgstr "Fatto"
214232
215−#: qml/Dash/ScopesOverview.qml:434
233+#: qml/Dash/ScopesOverview.qml:454
216234msgid "Store"
217235msgstr "Store"
218236
@@ -225,10 +243,10 @@ msgid "All"
225243msgstr "Tutto"
226244
227245#: qml/Greeter/Greeter.qml:157
228−msgid "Swipe to unlock"
229−msgstr "Scorrere per sbloccare"
246+msgid "Unlock"
247+msgstr ""
230248
231−#: qml/Hud/HudParametrizedActionsPage.qml:132
249+#: qml/Hud/HudParametrizedActionsPage.qml:139
232250msgid "Confirm"
233251msgstr "Conferma"
234252
@@ -248,15 +266,15 @@ msgstr "Parla ora..."
248266msgid "Speaking..."
249267msgstr "Sto parlando..."
250268
251−#: qml/Notifications/NotificationMenuItemFactory.qml:105
269+#: qml/Notifications/NotificationMenuItemFactory.qml:108
252270msgid "Show password"
253271msgstr "Mostra password"
254272
255−#: qml/Notifications/NotificationMenuItemFactory.qml:120
273+#: qml/Notifications/NotificationMenuItemFactory.qml:124
256274msgid "Enter SIM PIN"
257275msgstr "Inserire il PIN della SIM"
258276
259−#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
277+#: qml/Notifications/NotificationMenuItemFactory.qml:125
260278msgid "Sorry, incorrect PIN"
261279msgstr "PIN errato"
262280
@@ -268,27 +286,31 @@ msgstr "Tocca per tornare alla chiamata..."
268286msgid "Conference"
269287msgstr "Conferenza"
270288
271−#: qml/Panel/Indicators/MenuItemFactory.qml:651
289+#: qml/Panel/Indicators/MenuItemFactory.qml:600
290+msgid "Nothing is playing"
291+msgstr "Niente in riproduzione"
292+
293+#: qml/Panel/Indicators/MenuItemFactory.qml:748
272294msgid "In queue…"
273295msgstr "In coda..."
274296
275−#: qml/Panel/Indicators/MenuItemFactory.qml:655
297+#: qml/Panel/Indicators/MenuItemFactory.qml:752
276298msgid "Downloading"
277299msgstr "Scaricamento in corso"
278300
279−#: qml/Panel/Indicators/MenuItemFactory.qml:657
301+#: qml/Panel/Indicators/MenuItemFactory.qml:754
280302msgid "Paused, tap to resume"
281303msgstr "In pausa. Tocca per riprendere"
282304
283−#: qml/Panel/Indicators/MenuItemFactory.qml:659
305+#: qml/Panel/Indicators/MenuItemFactory.qml:756
284306msgid "Canceled"
285307msgstr "Annullato"
286308
287−#: qml/Panel/Indicators/MenuItemFactory.qml:661
309+#: qml/Panel/Indicators/MenuItemFactory.qml:758
288310msgid "Finished"
289311msgstr "Completato"
290312
291−#: qml/Panel/Indicators/MenuItemFactory.qml:663
313+#: qml/Panel/Indicators/MenuItemFactory.qml:760
292314msgid "Failed, tap to retry"
293315msgstr "Non riuscito. Tocca per riprovare"
294316
@@ -300,45 +322,49 @@ msgstr "Sblocca SIM"
300322msgid "Roaming"
301323msgstr "Roaming"
302324
303−#: qml/Shell.qml:266
304−msgid "Enter your passphrase"
305−msgstr "Digitare la passphrase"
325+#: qml/Shell.qml:340
326+msgid "Enter passphrase"
327+msgstr ""
306328
307−#: qml/Shell.qml:267
329+#: qml/Shell.qml:341
308330msgid "Sorry, incorrect passphrase"
309331msgstr "Passphrase errata"
310332
311−#: qml/Shell.qml:282
312−msgid "Enter your passcode"
333+#: qml/Shell.qml:342
334+msgid "Please re-enter"
313335msgstr ""
314336
315−#: qml/Shell.qml:283
316−msgid "Sorry, incorrect passcode"
337+#: qml/Shell.qml:344
338+msgid "Enter passcode"
317339msgstr ""
318340
319−#: qml/Shell.qml:273
341+#: qml/Shell.qml:345
342+msgid "Sorry, incorrect passcode"
343+msgstr "Passcode non corretto"
344+
345+#: qml/Shell.qml:348
320346#, qt-format
321−msgid "Enter your %1"
322−msgstr "Inserire %1"
347+msgid "Enter %1"
348+msgstr ""
323349
324−#: qml/Shell.qml:274
350+#: qml/Shell.qml:349
325351#, qt-format
326352msgid "Sorry, incorrect %1"
327353msgstr "%1 non corretto"
328354
329−#: qml/Shell.qml:310
355+#: qml/Shell.qml:384
330356msgid "Sorry, incorrect passphrase."
331357msgstr "Passphrase non corretta"
332358
333−#: qml/Shell.qml:311
359+#: qml/Shell.qml:385
334360msgid "Sorry, incorrect passcode."
335361msgstr "Passcode non corretto"
336362
337−#: qml/Shell.qml:312
363+#: qml/Shell.qml:386
338364msgid "This will be your last attempt."
339365msgstr "Questo sarà l'ultimo tentativo."
340366
341−#: qml/Shell.qml:314
367+#: qml/Shell.qml:388
342368msgid ""
343369"If passphrase is entered incorrectly, your phone will conduct a factory "
344370"reset and all personal data will be deleted."
@@ -346,7 +372,7 @@ msgstr ""
346372"Se verrà inserita una passphrase errata, il telefono eseguirà un ripristino "
347373"delle impostazioni di fabbrica e tutti i dati personali verranno eliminati."
348374
349−#: qml/Shell.qml:315
375+#: qml/Shell.qml:389
350376msgid ""
351377"If passcode is entered incorrectly, your phone will conduct a factory reset "
352378"and all personal data will be deleted."
@@ -354,11 +380,28 @@ msgstr ""
354380"Se verrà inserito una passcode errato, il telefono eseguirà un ripristino "
355381"delle impostazioni di fabbrica e tutti i dati personali verranno eliminati."
356382
357−#~ msgid "Are you sure you would like to turn power off?"
358−#~ msgstr "Spegnere veramente il dispositivo?"
383+#, qt-format
384+#~ msgid "Hello %1"
385+#~ msgstr "Ciao %1"
386+
387+#~ msgid "Hello"
388+#~ msgstr "Ciao"
389+
390+#~ msgid "Swipe to unlock"
391+#~ msgstr "Scorrere per sbloccare"
392+
393+#~ msgid "Please wait"
394+#~ msgstr "Attendere"
395+
396+#~ msgid "Too many incorrect attempts"
397+#~ msgstr "Troppi tentativi errati"
398+
399+#, qt-format
400+#~ msgid "Enter your %1"
401+#~ msgstr "Inserire %1"
359402
360−#~ msgid "Restart"
361−#~ msgstr "Riavvia"
403+#~ msgid "Enter your passphrase"
404+#~ msgstr "Digitare la passphrase"
362405
363−#~ msgid "Enter your PIN"
364−#~ msgstr "Inserire il PIN"
406+#~ msgid "Enter your passcode"
407+#~ msgstr "Inserire il passcode"
po/ja.po+140−96
@@ -7,78 +7,102 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-26 18:24+0200\n"
11−"PO-Revision-Date: 2014-08-18 15:03+0000\n"
10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
11+"PO-Revision-Date: 2014-09-18 09:47+0000\n"
1212"Last-Translator: Mitsuya Shibata <mty.shibata@gmail.com>\n"
1313"Language-Team: Japanese <ja@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-28 06:30+0000\n"
18−"X-Generator: Launchpad (build 17174)\n"
17+"Plural-Forms: nplurals=1; plural=0;\n"
18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"
19+"X-Generator: Launchpad (build 17196)\n"
1920
20−#: plugins/LightDM/Greeter.cpp:129
21+#: plugins/LightDM/Greeter.cpp:130
2122msgid "Password: "
2223msgstr "パスワード: "
2324
24−#: plugins/Unity/Launcher/launcheritem.cpp:43
25−#: plugins/Unity/Launcher/launcheritem.cpp:73
25+#: plugins/Unity/Launcher/launcheritem.cpp:45
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
2627msgid "Pin shortcut"
2728msgstr "ショートカットを追加する"
2829
29−#: plugins/Unity/Launcher/launcheritem.cpp:73
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
3031msgid "Unpin shortcut"
3132msgstr "ショートカットを削除する"
3233
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
3353#: qml/Components/Dialogs.qml:70
3454msgid "Log out"
35−msgstr ""
55+msgstr "ログアウト"
3656
3757#: qml/Components/Dialogs.qml:71
3858msgid "Are you sure you want to log out?"
39−msgstr ""
59+msgstr "本当にログアウトしますか?"
4060
4161#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97
4262#: qml/Components/Dialogs.qml:122
4363msgid "No"
44−msgstr ""
64+msgstr "いいえ"
4565
4666#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104
4767#: qml/Components/Dialogs.qml:129
4868msgid "Yes"
49−msgstr ""
69+msgstr "はい"
5070
5171#: qml/Components/Dialogs.qml:94
5272msgid "Shut down"
53−msgstr ""
73+msgstr "シャットダウン"
5474
5575#: qml/Components/Dialogs.qml:95
5676msgid "Are you sure you want to shut down?"
57−msgstr ""
77+msgstr "本当にシャットダウンしますか?"
5878
5979#: qml/Components/Dialogs.qml:119
6080msgid "Reboot"
61−msgstr ""
81+msgstr "再起動"
6282
6383#: qml/Components/Dialogs.qml:120
6484msgid "Are you sure you want to reboot?"
65−msgstr ""
85+msgstr "本当に再起動しますか?"
6686
6787#: qml/Components/Dialogs.qml:144
6888msgid "Power"
69−msgstr ""
89+msgstr "電源"
7090
7191#: qml/Components/Dialogs.qml:145
7292msgid ""
7393"Are you sure you would like\n"
7494"to power off?"
75−msgstr ""
95+msgstr "本当に電源を切りますか?"
7696
77−#: qml/Components/Dialogs.qml:144
97+#: qml/Components/Dialogs.qml:147
7898msgid "Power off"
7999msgstr "電源を切る"
80100
81−#: qml/Components/Dialogs.qml:162
101+#: qml/Components/Dialogs.qml:157
102+msgid "Restart"
103+msgstr "再起動"
104+
105+#: qml/Components/Dialogs.qml:167
82106msgid "Cancel"
83107msgstr "キャンセル"
84108
@@ -129,60 +153,44 @@ msgid ""
129153msgstr ""
130154"これでスマートフォンの操作に必要な、画面端を用いたジェスチャーを習得できました。<br><br>利用を開始するなら画面をタップしてください"
131155
132−#: qml/Components/Lockscreen.qml:167
133−msgid "Please wait"
134−msgstr "お待ちください"
135−
136−#: qml/Components/Lockscreen.qml:172
137−msgid "Too many incorrect attempts"
138−msgstr "失敗回数が上限に達しました"
139−
140−#: qml/Components/Lockscreen.qml:206
156+#: qml/Components/Lockscreen.qml:218
141157msgid "Emergency Call"
142158msgstr "緊急通報"
143159
144−#: qml/Components/Lockscreen.qml:226
160+#: qml/Components/Lockscreen.qml:250
145161msgid "OK"
146162msgstr "OK"
147163
148−#: qml/Components/PassphraseLockscreen.qml:61
149−#, qt-format
150−msgid "Hello %1"
151−msgstr "こんにちは %1 さん"
152−
153−#: qml/Components/PassphraseLockscreen.qml:61
154−msgid "Hello"
155−msgstr "こんにちは"
156−
157−#: qml/Dash/GenericScopeView.qml:361
164+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
158165msgid "See less"
159−msgstr ""
166+msgstr "隠す"
160167
161−#: qml/Dash/GenericScopeView.qml:361
168+#: qml/Dash/GenericScopeView.qml:411
162169msgid "See all"
163170msgstr "すべて表示する"
164171
165−#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
172+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
173+#: qml/Panel/SearchIndicator.qml:27
166174msgid "Search"
167175msgstr "検索"
168176
169−#: qml/Dash/PageHeader.qml:270
177+#: qml/Dash/PageHeader.qml:268
170178msgid "Settings"
171−msgstr ""
179+msgstr "設定"
172180
173−#: qml/Dash/PageHeader.qml:279
181+#: qml/Dash/PageHeader.qml:275
174182msgid "Remove from Favorites"
175−msgstr ""
183+msgstr "お気に入りから削除する"
176184
177−#: qml/Dash/PageHeader.qml:279
185+#: qml/Dash/PageHeader.qml:275
178186msgid "Add to Favorites"
179−msgstr ""
187+msgstr "お気に入りに追加する"
180188
181−#: qml/Dash/Previews/PreviewActionCombo.qml:34
189+#: qml/Dash/Previews/PreviewActionCombo.qml:35
182190msgid "More..."
183191msgstr "さらに ..."
184192
185−#: qml/Dash/Previews/PreviewActionCombo.qml:34
193+#: qml/Dash/Previews/PreviewActionCombo.qml:35
186194msgid "Less..."
187195msgstr "隠す..."
188196
@@ -198,15 +206,23 @@ msgstr "レビューを追加"
198206msgid "Send"
199207msgstr "送信"
200208
201−#: qml/Dash/ScopesOverview.qml:201
202−msgid "Manage Dash"
203−msgstr "Dashの管理"
209+#: qml/Dash/PullToRefreshScopeStyle.qml:55
210+msgid "Pull to refresh…"
211+msgstr ""
212+
213+#: qml/Dash/PullToRefreshScopeStyle.qml:60
214+msgid "Release to refresh…"
215+msgstr ""
204216
205−#: qml/Dash/ScopesOverview.qml:408
217+#: qml/Dash/ScopesOverview.qml:206
218+msgid "Manage Scopes"
219+msgstr ""
220+
221+#: qml/Dash/ScopesOverview.qml:428
206222msgid "Done"
207223msgstr "完了"
208224
209−#: qml/Dash/ScopesOverview.qml:434
225+#: qml/Dash/ScopesOverview.qml:454
210226msgid "Store"
211227msgstr "保存"
212228
@@ -219,10 +235,10 @@ msgid "All"
219235msgstr "すべて"
220236
221237#: qml/Greeter/Greeter.qml:157
222−msgid "Swipe to unlock"
223−msgstr "スワイプしてロック解除"
238+msgid "Unlock"
239+msgstr ""
224240
225−#: qml/Hud/HudParametrizedActionsPage.qml:132
241+#: qml/Hud/HudParametrizedActionsPage.qml:139
226242msgid "Confirm"
227243msgstr "確認"
228244
@@ -242,17 +258,17 @@ msgstr "音声入力を開始..."
242258msgid "Speaking..."
243259msgstr "入力中..."
244260
245−#: qml/Notifications/NotificationMenuItemFactory.qml:105
261+#: qml/Notifications/NotificationMenuItemFactory.qml:108
246262msgid "Show password"
247263msgstr "パスワードを表示"
248264
249−#: qml/Notifications/NotificationMenuItemFactory.qml:120
265+#: qml/Notifications/NotificationMenuItemFactory.qml:124
250266msgid "Enter SIM PIN"
251−msgstr ""
267+msgstr "SIM PINの入力"
252268
253−#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
269+#: qml/Notifications/NotificationMenuItemFactory.qml:125
254270msgid "Sorry, incorrect PIN"
255−msgstr ""
271+msgstr "PINが違います"
256272
257273#: qml/Panel/ActiveCallHint.qml:77
258274msgid "Tap to return to call..."
@@ -260,29 +276,33 @@ msgstr "タップすると通話に戻ります..."
260276
261277#: qml/Panel/ActiveCallHint.qml:90
262278msgid "Conference"
279+msgstr "グループ通話"
280+
281+#: qml/Panel/Indicators/MenuItemFactory.qml:600
282+msgid "Nothing is playing"
263283msgstr ""
264284
265−#: qml/Panel/Indicators/MenuItemFactory.qml:651
285+#: qml/Panel/Indicators/MenuItemFactory.qml:748
266286msgid "In queue…"
267−msgstr ""
287+msgstr "開始待ち..."
268288
269−#: qml/Panel/Indicators/MenuItemFactory.qml:655
289+#: qml/Panel/Indicators/MenuItemFactory.qml:752
270290msgid "Downloading"
271291msgstr "ダウンロード中"
272292
273−#: qml/Panel/Indicators/MenuItemFactory.qml:657
293+#: qml/Panel/Indicators/MenuItemFactory.qml:754
274294msgid "Paused, tap to resume"
275295msgstr "停止中、再開するにはタップしてください"
276296
277−#: qml/Panel/Indicators/MenuItemFactory.qml:659
297+#: qml/Panel/Indicators/MenuItemFactory.qml:756
278298msgid "Canceled"
279−msgstr ""
299+msgstr "中止しました"
280300
281−#: qml/Panel/Indicators/MenuItemFactory.qml:661
301+#: qml/Panel/Indicators/MenuItemFactory.qml:758
282302msgid "Finished"
283−msgstr ""
303+msgstr "完了しました"
284304
285−#: qml/Panel/Indicators/MenuItemFactory.qml:663
305+#: qml/Panel/Indicators/MenuItemFactory.qml:760
286306msgid "Failed, tap to retry"
287307msgstr "失敗しました、再試行するにはタップしてください"
288308
@@ -294,58 +314,82 @@ msgstr "SIMのアンロック"
294314msgid "Roaming"
295315msgstr "ローミング"
296316
297−#: qml/Shell.qml:266
298−msgid "Enter your passphrase"
317+#: qml/Shell.qml:340
318+msgid "Enter passphrase"
299319msgstr ""
300320
301−#: qml/Shell.qml:267
321+#: qml/Shell.qml:341
302322msgid "Sorry, incorrect passphrase"
323+msgstr "パスフレーズが違います"
324+
325+#: qml/Shell.qml:342
326+msgid "Please re-enter"
303327msgstr ""
304328
305−#: qml/Shell.qml:282
306−msgid "Enter your passcode"
329+#: qml/Shell.qml:344
330+msgid "Enter passcode"
307331msgstr ""
308332
309−#: qml/Shell.qml:283
333+#: qml/Shell.qml:345
310334msgid "Sorry, incorrect passcode"
311−msgstr ""
335+msgstr "パスコードが違います"
312336
313−#: qml/Shell.qml:273
337+#: qml/Shell.qml:348
314338#, qt-format
315−msgid "Enter your %1"
316−msgstr "%1を入力してください"
339+msgid "Enter %1"
340+msgstr ""
317341
318−#: qml/Shell.qml:274
342+#: qml/Shell.qml:349
319343#, qt-format
320344msgid "Sorry, incorrect %1"
321−msgstr ""
345+msgstr "%1が違います"
322346
323−#: qml/Shell.qml:310
347+#: qml/Shell.qml:384
324348msgid "Sorry, incorrect passphrase."
325349msgstr "パスフレーズが間違っています。"
326350
327−#: qml/Shell.qml:311
351+#: qml/Shell.qml:385
328352msgid "Sorry, incorrect passcode."
329353msgstr "パスコードが間違っています。"
330354
331−#: qml/Shell.qml:312
355+#: qml/Shell.qml:386
332356msgid "This will be your last attempt."
333357msgstr "これが最後のチャンスです。"
334358
335−#: qml/Shell.qml:314
359+#: qml/Shell.qml:388
336360msgid ""
337361"If passphrase is entered incorrectly, your phone will conduct a factory "
338362"reset and all personal data will be deleted."
339−msgstr ""
363+msgstr "パスフレーズが間違っている場合、ファクトリーリセットを実施し、すべての個人データは削除されます。"
340364
341−#: qml/Shell.qml:315
365+#: qml/Shell.qml:389
342366msgid ""
343367"If passcode is entered incorrectly, your phone will conduct a factory reset "
344368"and all personal data will be deleted."
345−msgstr ""
369+msgstr "パスコードが間違っている場合、ファクトリーリセットを実施し、すべての個人データは削除されます。"
370+
371+#, qt-format
372+#~ msgid "Hello %1"
373+#~ msgstr "こんにちは %1 さん"
374+
375+#~ msgid "Hello"
376+#~ msgstr "こんにちは"
377+
378+#~ msgid "Swipe to unlock"
379+#~ msgstr "スワイプしてロック解除"
380+
381+#~ msgid "Too many incorrect attempts"
382+#~ msgstr "失敗回数が上限に達しました"
383+
384+#~ msgid "Please wait"
385+#~ msgstr "お待ちください"
386+
387+#, qt-format
388+#~ msgid "Enter your %1"
389+#~ msgstr "%1を入力してください"
346390
347−#~ msgid "Are you sure you would like to turn power off?"
348−#~ msgstr "本当に電源を切りますか?"
391+#~ msgid "Enter your passphrase"
392+#~ msgstr "パスフレーズの入力"
349393
350−#~ msgid "Restart"
351−#~ msgstr "再起動"
394+#~ msgid "Enter your passcode"
395+#~ msgstr "パスコードの入力"
po/km.po+135−89
@@ -7,78 +7,104 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-26 18:24+0200\n"
10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
1111"PO-Revision-Date: 2014-08-20 02:48+0000\n"
12−"Last-Translator: Sok Sophea <sksophea@gmail.com>\n"
12+"Last-Translator: Sophea Sok <sksophea@gmail.com>\n"
1313"Language-Team: Khmer <km@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-28 06:30+0000\n"
18−"X-Generator: Launchpad (build 17174)\n"
17+"Plural-Forms: nplurals=1; plural=0;\n"
18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"
19+"X-Generator: Launchpad (build 17196)\n"
1920
20−#: plugins/LightDM/Greeter.cpp:129
21+#: plugins/LightDM/Greeter.cpp:130
2122msgid "Password: "
2223msgstr "ពាក្យសម្ងាត់៖ "
2324
24−#: plugins/Unity/Launcher/launcheritem.cpp:43
25−#: plugins/Unity/Launcher/launcheritem.cpp:73
25+#: plugins/Unity/Launcher/launcheritem.cpp:45
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
2627msgid "Pin shortcut"
2728msgstr "ភ្ជាប់​ផ្លូវកាត់"
2829
29−#: plugins/Unity/Launcher/launcheritem.cpp:73
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
3031msgid "Unpin shortcut"
3132msgstr "មិន​ភ្ជាប់ផ្លូវកាត់"
3233
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
3353#: qml/Components/Dialogs.qml:70
3454msgid "Log out"
35−msgstr ""
55+msgstr "ចេញ"
3656
3757#: qml/Components/Dialogs.qml:71
3858msgid "Are you sure you want to log out?"
39−msgstr ""
59+msgstr "តើ​អ្នក​ពិតជា​ចង់​ចេញ​មែន​ឬ?"
4060
4161#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97
4262#: qml/Components/Dialogs.qml:122
4363msgid "No"
44−msgstr ""
64+msgstr "ទេ"
4565
4666#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104
4767#: qml/Components/Dialogs.qml:129
4868msgid "Yes"
49−msgstr ""
69+msgstr "បាទ/ចាស"
5070
5171#: qml/Components/Dialogs.qml:94
5272msgid "Shut down"
53−msgstr ""
73+msgstr "បិទ"
5474
5575#: qml/Components/Dialogs.qml:95
5676msgid "Are you sure you want to shut down?"
57−msgstr ""
77+msgstr "តើ​អ្នក​ពិតជា​ចង់​បិទ​មែន​ឬ?"
5878
5979#: qml/Components/Dialogs.qml:119
6080msgid "Reboot"
61−msgstr ""
81+msgstr "ចាប់ផ្ដើម​ឡើងវិញ"
6282
6383#: qml/Components/Dialogs.qml:120
6484msgid "Are you sure you want to reboot?"
65−msgstr ""
85+msgstr "តើ​អ្នក​ពិតជា​ចង់​ចាប់ផ្ដើម​ឡើងវិញ​មែន​ឬ?"
6686
6787#: qml/Components/Dialogs.qml:144
6888msgid "Power"
69−msgstr ""
89+msgstr "បីទ/បើក"
7090
7191#: qml/Components/Dialogs.qml:145
7292msgid ""
7393"Are you sure you would like\n"
7494"to power off?"
7595msgstr ""
96+"តើ​អ្នក​ពិតជា​ចង់\n"
97+"បិទ​មែន​ឬ?"
7698
77−#: qml/Components/Dialogs.qml:144
99+#: qml/Components/Dialogs.qml:147
78100msgid "Power off"
79101msgstr "បិទ"
80102
81−#: qml/Components/Dialogs.qml:162
103+#: qml/Components/Dialogs.qml:157
104+msgid "Restart"
105+msgstr "ចាប់​ផ្ដើម​ឡើង​វិញ"
106+
107+#: qml/Components/Dialogs.qml:167
82108msgid "Cancel"
83109msgstr "បោះបង់"
84110
@@ -132,60 +158,44 @@ msgstr ""
132158"ឥឡូវ​អ្នក​បាន​ពិនិត្យ​កាយវិការ​គែម​ "
133159"និង​អាច​ចាប់ផ្ដើម​ប្រើ​ទូរស័ព្ទ<br><br>ប៉ះ លើ​អេក្រង់​ដើម្បី​ចាប់ផ្ដើម"
134160
135−#: qml/Components/Lockscreen.qml:167
136−msgid "Please wait"
137−msgstr "សូមរង់ចាំ"
138−
139−#: qml/Components/Lockscreen.qml:172
140−msgid "Too many incorrect attempts"
141−msgstr "បាន​ព្យាយាម​ខុស​ច្រើន​ដង​ពេក"
142−
143−#: qml/Components/Lockscreen.qml:206
161+#: qml/Components/Lockscreen.qml:218
144162msgid "Emergency Call"
145163msgstr "ការ​ហៅ​ពេល​អាសន្ន"
146164
147−#: qml/Components/Lockscreen.qml:226
165+#: qml/Components/Lockscreen.qml:250
148166msgid "OK"
149167msgstr "យល់ព្រម"
150168
151−#: qml/Components/PassphraseLockscreen.qml:61
152−#, qt-format
153−msgid "Hello %1"
154−msgstr "សួស្ដី %1"
155−
156−#: qml/Components/PassphraseLockscreen.qml:61
157−msgid "Hello"
158−msgstr "សួស្តី"
159−
160−#: qml/Dash/GenericScopeView.qml:361
169+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
161170msgid "See less"
162171msgstr "មើល​តិច​ជាង"
163172
164−#: qml/Dash/GenericScopeView.qml:361
173+#: qml/Dash/GenericScopeView.qml:411
165174msgid "See all"
166175msgstr "មើល​ទាំងអស់"
167176
168−#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
177+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
178+#: qml/Panel/SearchIndicator.qml:27
169179msgid "Search"
170180msgstr "ស្វែង​រក"
171181
172−#: qml/Dash/PageHeader.qml:270
182+#: qml/Dash/PageHeader.qml:268
173183msgid "Settings"
174−msgstr ""
184+msgstr "ការកំណត់"
175185
176−#: qml/Dash/PageHeader.qml:279
186+#: qml/Dash/PageHeader.qml:275
177187msgid "Remove from Favorites"
178−msgstr ""
188+msgstr "យក​ចេញពី​សំណព្វ"
179189
180−#: qml/Dash/PageHeader.qml:279
190+#: qml/Dash/PageHeader.qml:275
181191msgid "Add to Favorites"
182−msgstr ""
192+msgstr "បន្ថែម​ទៅ​សណព្វ"
183193
184−#: qml/Dash/Previews/PreviewActionCombo.qml:34
194+#: qml/Dash/Previews/PreviewActionCombo.qml:35
185195msgid "More..."
186196msgstr "ច្រើនជាង​..."
187197
188−#: qml/Dash/Previews/PreviewActionCombo.qml:34
198+#: qml/Dash/Previews/PreviewActionCombo.qml:35
189199msgid "Less..."
190200msgstr "តិច​ជាង..."
191201
@@ -201,15 +211,23 @@ msgstr "បន្ថែម​ការ​ពិនិត្យ"
201211msgid "Send"
202212msgstr "ផ្ញើ"
203213
204−#: qml/Dash/ScopesOverview.qml:201
205−msgid "Manage Dash"
206−msgstr "គ្រប់គ្រង​ផ្ទាំង"
214+#: qml/Dash/PullToRefreshScopeStyle.qml:55
215+msgid "Pull to refresh…"
216+msgstr ""
207217
208−#: qml/Dash/ScopesOverview.qml:408
218+#: qml/Dash/PullToRefreshScopeStyle.qml:60
219+msgid "Release to refresh…"
220+msgstr ""
221+
222+#: qml/Dash/ScopesOverview.qml:206
223+msgid "Manage Scopes"
224+msgstr ""
225+
226+#: qml/Dash/ScopesOverview.qml:428
209227msgid "Done"
210228msgstr "ធ្វើរួច"
211229
212−#: qml/Dash/ScopesOverview.qml:434
230+#: qml/Dash/ScopesOverview.qml:454
213231msgid "Store"
214232msgstr "រក្សាទុក"
215233
@@ -222,10 +240,10 @@ msgid "All"
222240msgstr "ទាំងអស់"
223241
224242#: qml/Greeter/Greeter.qml:157
225−msgid "Swipe to unlock"
226−msgstr "អូស​ដើម្បី​ដោះសោ"
243+msgid "Unlock"
244+msgstr ""
227245
228−#: qml/Hud/HudParametrizedActionsPage.qml:132
246+#: qml/Hud/HudParametrizedActionsPage.qml:139
229247msgid "Confirm"
230248msgstr "បញ្ជាក់"
231249
@@ -245,17 +263,17 @@ msgstr "និយាយ​ឥឡូវ..."
245263msgid "Speaking..."
246264msgstr "កំពុង​និយាយ..."
247265
248−#: qml/Notifications/NotificationMenuItemFactory.qml:105
266+#: qml/Notifications/NotificationMenuItemFactory.qml:108
249267msgid "Show password"
250268msgstr "បង្ហាញ​ពាក្យ​សម្ងាត់"
251269
252−#: qml/Notifications/NotificationMenuItemFactory.qml:120
270+#: qml/Notifications/NotificationMenuItemFactory.qml:124
253271msgid "Enter SIM PIN"
254−msgstr ""
272+msgstr "បញ្ចូល​លេខ​កូដ PIN ស៊ីម"
255273
256−#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
274+#: qml/Notifications/NotificationMenuItemFactory.qml:125
257275msgid "Sorry, incorrect PIN"
258−msgstr ""
276+msgstr "សូមទោស! លេខ​កូដ PIN មិន​ត្រឹមត្រូវ"
259277
260278#: qml/Panel/ActiveCallHint.qml:77
261279msgid "Tap to return to call..."
@@ -265,27 +283,31 @@ msgstr "ប៉ះ​ដើម្បី​ត្រឡប់​ទៅ​ការ
265283msgid "Conference"
266284msgstr "សន្និសីទ"
267285
268−#: qml/Panel/Indicators/MenuItemFactory.qml:651
286+#: qml/Panel/Indicators/MenuItemFactory.qml:600
287+msgid "Nothing is playing"
288+msgstr ""
289+
290+#: qml/Panel/Indicators/MenuItemFactory.qml:748
269291msgid "In queue…"
270292msgstr "ក្នុងជួរ…"
271293
272−#: qml/Panel/Indicators/MenuItemFactory.qml:655
294+#: qml/Panel/Indicators/MenuItemFactory.qml:752
273295msgid "Downloading"
274296msgstr "ទាញយក"
275297
276−#: qml/Panel/Indicators/MenuItemFactory.qml:657
298+#: qml/Panel/Indicators/MenuItemFactory.qml:754
277299msgid "Paused, tap to resume"
278300msgstr "បាន​ផ្អាក, ប៉ះ ដើម្បីបន្ត"
279301
280−#: qml/Panel/Indicators/MenuItemFactory.qml:659
302+#: qml/Panel/Indicators/MenuItemFactory.qml:756
281303msgid "Canceled"
282304msgstr "បាន​បោះបង់"
283305
284−#: qml/Panel/Indicators/MenuItemFactory.qml:661
306+#: qml/Panel/Indicators/MenuItemFactory.qml:758
285307msgid "Finished"
286308msgstr "បាន​បញ្ចប់"
287309
288−#: qml/Panel/Indicators/MenuItemFactory.qml:663
310+#: qml/Panel/Indicators/MenuItemFactory.qml:760
289311msgid "Failed, tap to retry"
290312msgstr "បាន​បរាជ័យ ប៉ះ​ ដើម្បី​ព្យាយាម​ម្ដង​ទៀត"
291313
@@ -297,45 +319,49 @@ msgstr "ដោះ​សោ​ស៊ីម"
297319msgid "Roaming"
298320msgstr "រ៉ូមីង"
299321
300−#: qml/Shell.qml:266
301−msgid "Enter your passphrase"
322+#: qml/Shell.qml:340
323+msgid "Enter passphrase"
302324msgstr ""
303325
304−#: qml/Shell.qml:267
326+#: qml/Shell.qml:341
305327msgid "Sorry, incorrect passphrase"
328+msgstr "សូមទោស! ឃ្លា​សម្ងាត់​មិន​ត្រឹមត្រូវ"
329+
330+#: qml/Shell.qml:342
331+msgid "Please re-enter"
306332msgstr ""
307333
308−#: qml/Shell.qml:282
309−msgid "Enter your passcode"
334+#: qml/Shell.qml:344
335+msgid "Enter passcode"
310336msgstr ""
311337
312−#: qml/Shell.qml:283
338+#: qml/Shell.qml:345
313339msgid "Sorry, incorrect passcode"
314−msgstr ""
340+msgstr "សូមទោស! កូដ​សម្ងាត់​មិន​ត្រឹមត្រូវ"
315341
316−#: qml/Shell.qml:273
342+#: qml/Shell.qml:348
317343#, qt-format
318−msgid "Enter your %1"
319−msgstr "បញ្ចូល %1 របស់​អ្នក"
344+msgid "Enter %1"
345+msgstr ""
320346
321−#: qml/Shell.qml:274
347+#: qml/Shell.qml:349
322348#, qt-format
323349msgid "Sorry, incorrect %1"
324−msgstr ""
350+msgstr "សូមទោស! %1 មិន​ត្រឹមត្រូវ"
325351
326−#: qml/Shell.qml:310
352+#: qml/Shell.qml:384
327353msgid "Sorry, incorrect passphrase."
328354msgstr "សូមទោស! ឃ្លា​សម្ងាត់​មិន​ត្រឹមត្រូវ។"
329355
330−#: qml/Shell.qml:311
356+#: qml/Shell.qml:385
331357msgid "Sorry, incorrect passcode."
332358msgstr "សូមទោស! កូដ​សម្ងាត់​មិន​ត្រឹមត្រូវ។"
333359
334−#: qml/Shell.qml:312
360+#: qml/Shell.qml:386
335361msgid "This will be your last attempt."
336362msgstr "នេះ​គឺ​ការ​ព្យាយាម​លើក​ចុងក្រោយ។"
337363
338−#: qml/Shell.qml:314
364+#: qml/Shell.qml:388
339365msgid ""
340366"If passphrase is entered incorrectly, your phone will conduct a factory "
341367"reset and all personal data will be deleted."
@@ -344,7 +370,7 @@ msgstr ""
344370"ទូរស័ព្ទ​របស់​អ្នក​នឹង​កំណត់​ទៅ​ទិន្នន័យ​ពី​រោងចក្រ​វិញ "
345371"ហើយ​ទិន្នន័យ​ផ្ទាល់ខ្លួន​ទាំងអស់​របស់​អ្នក​នឹង​ត្រូវ​បាន​លុប។"
346372
347−#: qml/Shell.qml:315
373+#: qml/Shell.qml:389
348374msgid ""
349375"If passcode is entered incorrectly, your phone will conduct a factory reset "
350376"and all personal data will be deleted."
@@ -353,8 +379,28 @@ msgstr ""
353379"ទូរស័ព្ទ​របស់​អ្នក​នឹង​កំណត់​ទៅ​ទិន្នន័យ​ពី​រោងចក្រ​វិញ "
354380"ហើយ​ទិន្នន័យ​ផ្ទាល់ខ្លួន​ទាំងអស់​របស់​អ្នក​នឹង​ត្រូវ​បាន​លុប។"
355381
356−#~ msgid "Are you sure you would like to turn power off?"
357−#~ msgstr "តើ​អ្នក​ពិតជា​ចង់​បិទ​មែន​ឬ?"
382+#, qt-format
383+#~ msgid "Hello %1"
384+#~ msgstr "សួស្ដី %1"
385+
386+#~ msgid "Hello"
387+#~ msgstr "សួស្តី"
388+
389+#~ msgid "Swipe to unlock"
390+#~ msgstr "អូស​ដើម្បី​ដោះសោ"
391+
392+#~ msgid "Please wait"
393+#~ msgstr "សូមរង់ចាំ"
394+
395+#~ msgid "Too many incorrect attempts"
396+#~ msgstr "បាន​ព្យាយាម​ខុស​ច្រើន​ដង​ពេក"
397+
398+#, qt-format
399+#~ msgid "Enter your %1"
400+#~ msgstr "បញ្ចូល %1 របស់​អ្នក"
401+
402+#~ msgid "Enter your passphrase"
403+#~ msgstr "បញ្ចូល​ឃ្លា​សម្ងាត់​របស់​អ្នក"
358404
359−#~ msgid "Restart"
360−#~ msgstr "ចាប់ផ្ដើម​ឡើងវិញ"
405+#~ msgid "Enter your passcode"
406+#~ msgstr "បញ្ចូល​កូដ​សម្ងាត់​របស់​អ្នក"
po/kn.po+89−65
@@ -7,29 +7,49 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-26 18:24+0200\n"
10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
1111"PO-Revision-Date: 2013-06-27 05:43+0000\n"
1212"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"
1313"Language-Team: Kannada <kn@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-28 06:30+0000\n"
18−"X-Generator: Launchpad (build 17174)\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"
19+"X-Generator: Launchpad (build 17196)\n"
1920
20−#: plugins/LightDM/Greeter.cpp:129
21+#: plugins/LightDM/Greeter.cpp:130
2122msgid "Password: "
2223msgstr ""
2324
24−#: plugins/Unity/Launcher/launcheritem.cpp:43
25−#: plugins/Unity/Launcher/launcheritem.cpp:73
25+#: plugins/Unity/Launcher/launcheritem.cpp:45
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
2627msgid "Pin shortcut"
2728msgstr ""
2829
29−#: plugins/Unity/Launcher/launcheritem.cpp:73
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
3031msgid "Unpin shortcut"
3132msgstr ""
3233
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
3353#: qml/Components/Dialogs.qml:70
3454msgid "Log out"
3555msgstr ""
@@ -74,11 +94,15 @@ msgid ""
7494"to power off?"
7595msgstr ""
7696
77−#: qml/Components/Dialogs.qml:144
97+#: qml/Components/Dialogs.qml:147
7898msgid "Power off"
7999msgstr ""
80100
81−#: qml/Components/Dialogs.qml:162
101+#: qml/Components/Dialogs.qml:157
102+msgid "Restart"
103+msgstr ""
104+
105+#: qml/Components/Dialogs.qml:167
82106msgid "Cancel"
83107msgstr ""
84108
@@ -128,60 +152,44 @@ msgid ""
128152"phone<br><br>Tap on the screen to start"
129153msgstr ""
130154
131−#: qml/Components/Lockscreen.qml:167
132−msgid "Please wait"
133−msgstr ""
134−
135−#: qml/Components/Lockscreen.qml:172
136−msgid "Too many incorrect attempts"
137−msgstr ""
138−
139−#: qml/Components/Lockscreen.qml:206
155+#: qml/Components/Lockscreen.qml:218
140156msgid "Emergency Call"
141157msgstr ""
142158
143−#: qml/Components/Lockscreen.qml:226
159+#: qml/Components/Lockscreen.qml:250
144160msgid "OK"
145161msgstr ""
146162
147−#: qml/Components/PassphraseLockscreen.qml:61
148−#, qt-format
149−msgid "Hello %1"
150−msgstr ""
151−
152−#: qml/Components/PassphraseLockscreen.qml:61
153−msgid "Hello"
154−msgstr ""
155−
156−#: qml/Dash/GenericScopeView.qml:361
163+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
157164msgid "See less"
158165msgstr ""
159166
160−#: qml/Dash/GenericScopeView.qml:361
167+#: qml/Dash/GenericScopeView.qml:411
161168msgid "See all"
162169msgstr ""
163170
164−#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
171+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
172+#: qml/Panel/SearchIndicator.qml:27
165173msgid "Search"
166174msgstr "ಹುಡುಕು"
167175
168−#: qml/Dash/PageHeader.qml:270
176+#: qml/Dash/PageHeader.qml:268
169177msgid "Settings"
170178msgstr ""
171179
172−#: qml/Dash/PageHeader.qml:279
180+#: qml/Dash/PageHeader.qml:275
173181msgid "Remove from Favorites"
174182msgstr ""
175183
176−#: qml/Dash/PageHeader.qml:279
184+#: qml/Dash/PageHeader.qml:275
177185msgid "Add to Favorites"
178186msgstr ""
179187
180−#: qml/Dash/Previews/PreviewActionCombo.qml:34
188+#: qml/Dash/Previews/PreviewActionCombo.qml:35
181189msgid "More..."
182190msgstr ""
183191
184−#: qml/Dash/Previews/PreviewActionCombo.qml:34
192+#: qml/Dash/Previews/PreviewActionCombo.qml:35
185193msgid "Less..."
186194msgstr ""
187195
@@ -197,15 +205,23 @@ msgstr ""
197205msgid "Send"
198206msgstr ""
199207
200−#: qml/Dash/ScopesOverview.qml:201
201−msgid "Manage Dash"
208+#: qml/Dash/PullToRefreshScopeStyle.qml:55
209+msgid "Pull to refresh…"
210+msgstr ""
211+
212+#: qml/Dash/PullToRefreshScopeStyle.qml:60
213+msgid "Release to refresh…"
214+msgstr ""
215+
216+#: qml/Dash/ScopesOverview.qml:206
217+msgid "Manage Scopes"
202218msgstr ""
203219
204−#: qml/Dash/ScopesOverview.qml:408
220+#: qml/Dash/ScopesOverview.qml:428
205221msgid "Done"
206222msgstr ""
207223
208−#: qml/Dash/ScopesOverview.qml:434
224+#: qml/Dash/ScopesOverview.qml:454
209225msgid "Store"
210226msgstr ""
211227
@@ -218,10 +234,10 @@ msgid "All"
218234msgstr ""
219235
220236#: qml/Greeter/Greeter.qml:157
221−msgid "Swipe to unlock"
237+msgid "Unlock"
222238msgstr ""
223239
224−#: qml/Hud/HudParametrizedActionsPage.qml:132
240+#: qml/Hud/HudParametrizedActionsPage.qml:139
225241msgid "Confirm"
226242msgstr "ಖಚಿತಪಡಿಸು"
227243
@@ -241,15 +257,15 @@ msgstr "ಈಗ ಮಾತನಾಡಿ ..."
241257msgid "Speaking..."
242258msgstr "ಮಾತನಾಡುತಿದ್ದೀರಿ"
243259
244−#: qml/Notifications/NotificationMenuItemFactory.qml:105
260+#: qml/Notifications/NotificationMenuItemFactory.qml:108
245261msgid "Show password"
246262msgstr ""
247263
248−#: qml/Notifications/NotificationMenuItemFactory.qml:120
264+#: qml/Notifications/NotificationMenuItemFactory.qml:124
249265msgid "Enter SIM PIN"
250266msgstr ""
251267
252−#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
268+#: qml/Notifications/NotificationMenuItemFactory.qml:125
253269msgid "Sorry, incorrect PIN"
254270msgstr ""
255271
@@ -261,27 +277,31 @@ msgstr ""
261277msgid "Conference"
262278msgstr ""
263279
264−#: qml/Panel/Indicators/MenuItemFactory.qml:651
280+#: qml/Panel/Indicators/MenuItemFactory.qml:600
281+msgid "Nothing is playing"
282+msgstr ""
283+
284+#: qml/Panel/Indicators/MenuItemFactory.qml:748
265285msgid "In queue…"
266286msgstr ""
267287
268−#: qml/Panel/Indicators/MenuItemFactory.qml:655
288+#: qml/Panel/Indicators/MenuItemFactory.qml:752
269289msgid "Downloading"
270290msgstr ""
271291
272−#: qml/Panel/Indicators/MenuItemFactory.qml:657
292+#: qml/Panel/Indicators/MenuItemFactory.qml:754
273293msgid "Paused, tap to resume"
274294msgstr ""
275295
276−#: qml/Panel/Indicators/MenuItemFactory.qml:659
296+#: qml/Panel/Indicators/MenuItemFactory.qml:756
277297msgid "Canceled"
278298msgstr ""
279299
280−#: qml/Panel/Indicators/MenuItemFactory.qml:661
300+#: qml/Panel/Indicators/MenuItemFactory.qml:758
281301msgid "Finished"
282302msgstr ""
283303
284−#: qml/Panel/Indicators/MenuItemFactory.qml:663
304+#: qml/Panel/Indicators/MenuItemFactory.qml:760
285305msgid "Failed, tap to retry"
286306msgstr ""
287307
@@ -293,51 +313,55 @@ msgstr ""
293313msgid "Roaming"
294314msgstr ""
295315
296−#: qml/Shell.qml:266
297−msgid "Enter your passphrase"
316+#: qml/Shell.qml:340
317+msgid "Enter passphrase"
298318msgstr ""
299319
300−#: qml/Shell.qml:267
320+#: qml/Shell.qml:341
301321msgid "Sorry, incorrect passphrase"
302322msgstr ""
303323
304−#: qml/Shell.qml:282
305−msgid "Enter your passcode"
324+#: qml/Shell.qml:342
325+msgid "Please re-enter"
326+msgstr ""
327+
328+#: qml/Shell.qml:344
329+msgid "Enter passcode"
306330msgstr ""
307331
308−#: qml/Shell.qml:283
332+#: qml/Shell.qml:345
309333msgid "Sorry, incorrect passcode"
310334msgstr ""
311335
312−#: qml/Shell.qml:273
336+#: qml/Shell.qml:348
313337#, qt-format
314−msgid "Enter your %1"
338+msgid "Enter %1"
315339msgstr ""
316340
317−#: qml/Shell.qml:274
341+#: qml/Shell.qml:349
318342#, qt-format
319343msgid "Sorry, incorrect %1"
320344msgstr ""
321345
322−#: qml/Shell.qml:310
346+#: qml/Shell.qml:384
323347msgid "Sorry, incorrect passphrase."
324348msgstr ""
325349
326−#: qml/Shell.qml:311
350+#: qml/Shell.qml:385
327351msgid "Sorry, incorrect passcode."
328352msgstr ""
329353
330−#: qml/Shell.qml:312
354+#: qml/Shell.qml:386
331355msgid "This will be your last attempt."
332356msgstr ""
333357
334−#: qml/Shell.qml:314
358+#: qml/Shell.qml:388
335359msgid ""
336360"If passphrase is entered incorrectly, your phone will conduct a factory "
337361"reset and all personal data will be deleted."
338362msgstr ""
339363
340−#: qml/Shell.qml:315
364+#: qml/Shell.qml:389
341365msgid ""
342366"If passcode is entered incorrectly, your phone will conduct a factory reset "
343367"and all personal data will be deleted."
po/ko.po+160−120
@@ -7,78 +7,101 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-26 18:24+0200\n"
10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
1111"PO-Revision-Date: 2014-08-19 13:02+0000\n"
1212"Last-Translator: MinSik CHO <Unknown>\n"
1313"Language-Team: Korean <ko@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-28 06:30+0000\n"
18−"X-Generator: Launchpad (build 17174)\n"
17+"Plural-Forms: nplurals=1; plural=0;\n"
18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"
19+"X-Generator: Launchpad (build 17196)\n"
1920
20−#: plugins/LightDM/Greeter.cpp:129
21+#: plugins/LightDM/Greeter.cpp:130
2122msgid "Password: "
22−msgstr "열쇠글: "
23+msgstr "암호: "
2324
24−#: plugins/Unity/Launcher/launcheritem.cpp:43
25−#: plugins/Unity/Launcher/launcheritem.cpp:73
25+#: plugins/Unity/Launcher/launcheritem.cpp:45
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
2627msgid "Pin shortcut"
27−msgstr "바로가기를 고정하기"
28+msgstr "바로 가기를 고정"
2829
29−#: plugins/Unity/Launcher/launcheritem.cpp:73
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
3031msgid "Unpin shortcut"
31−msgstr "바로가기를 고정 해제하기"
32+msgstr "바로 가기를 고정 해제"
33+
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr "장치가 잠김"
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr "올바르지 않은 패스프레이즈를 너무 많이 입력해 장치가 잠겼습니다."
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr "올바르지 않은 패스코드를 너무 많이 입력해 장치가 잠겼습니다."
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] "%1분 정도 기다린 후 다시 시독해주십시오..."
3251
3352#: qml/Components/Dialogs.qml:70
3453msgid "Log out"
35−msgstr ""
54+msgstr "로그아웃"
3655
3756#: qml/Components/Dialogs.qml:71
3857msgid "Are you sure you want to log out?"
39−msgstr ""
58+msgstr "정말 로그아웃하시겠습니까?"
4059
4160#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97
4261#: qml/Components/Dialogs.qml:122
4362msgid "No"
44−msgstr ""
63+msgstr "아니요"
4564
4665#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104
4766#: qml/Components/Dialogs.qml:129
4867msgid "Yes"
49−msgstr ""
68+msgstr "예"
5069
5170#: qml/Components/Dialogs.qml:94
5271msgid "Shut down"
53−msgstr ""
72+msgstr "컴퓨터 끄기"
5473
5574#: qml/Components/Dialogs.qml:95
5675msgid "Are you sure you want to shut down?"
57−msgstr ""
76+msgstr "정말 컴퓨터를 끄시겠습니까?"
5877
5978#: qml/Components/Dialogs.qml:119
6079msgid "Reboot"
61−msgstr ""
80+msgstr "다시 시작"
6281
6382#: qml/Components/Dialogs.qml:120
6483msgid "Are you sure you want to reboot?"
65−msgstr ""
84+msgstr "정말 컴퓨터를 다시 시작하시겠습니까?"
6685
6786#: qml/Components/Dialogs.qml:144
6887msgid "Power"
69−msgstr ""
88+msgstr "전원"
7089
7190#: qml/Components/Dialogs.qml:145
7291msgid ""
7392"Are you sure you would like\n"
7493"to power off?"
75−msgstr ""
94+msgstr "정말 컴퓨터를 끄시겠습니까?"
7695
77−#: qml/Components/Dialogs.qml:144
96+#: qml/Components/Dialogs.qml:147
7897msgid "Power off"
7998msgstr "전원 끄기"
8099
81−#: qml/Components/Dialogs.qml:162
100+#: qml/Components/Dialogs.qml:157
101+msgid "Restart"
102+msgstr "다시 시작"
103+
104+#: qml/Components/Dialogs.qml:167
82105msgid "Cancel"
83106msgstr "취소"
84107
@@ -92,15 +115,15 @@ msgstr "오른쪽 끝"
92115
93116#: qml/Components/EdgeDemo.qml:113
94117msgid "Try swiping from the right edge to unlock the phone"
95−msgstr "휴대 전화를 잠금 해제하려면 오른쪽에서부터 끌어보세요."
118+msgstr "오른쪽 가장자리에서 쓸면 휴대 전화의 잠금을 해제합니다."
96119
97120#: qml/Components/EdgeDemo.qml:144
98121msgid "Top edge"
99−msgstr "윗쪽 끝"
122+msgstr "윗쪽 가장자리"
100123
101124#: qml/Components/EdgeDemo.qml:145
102125msgid "Try swiping from the top edge to access the indicators"
103−msgstr "알림을 보려면 위쪽에서 끌어보세요."
126+msgstr "위쪽 가장자리에서 쓸면 알림에 접근할 수 있습니다."
104127
105128#: qml/Components/EdgeDemo.qml:170
106129msgid "Close"
@@ -108,15 +131,15 @@ msgstr "닫기"
108131
109132#: qml/Components/EdgeDemo.qml:171
110133msgid "Swipe up again to close the settings screen"
111−msgstr "환경설정 창을 닫으려면 위로 다시 끌어보세요."
134+msgstr "위쪽으로 쓸면 설정 화면을 닫습니다."
112135
113136#: qml/Components/EdgeDemo.qml:198
114137msgid "Left edge"
115−msgstr "왼쪽 끝"
138+msgstr "왼쪽 가장자리"
116139
117140#: qml/Components/EdgeDemo.qml:199
118141msgid "Swipe from the left to reveal the launcher for quick access to apps"
119−msgstr "애플리케이션을 빠르게 열기 위해 런처를 보려면 왼쪽에서 끌어보세요."
142+msgstr "왼쪽에서 쓸면 런처를 표시해 프로그램에 빠르게 접근할 수 있습니다."
120143
121144#: qml/Components/EdgeDemo.qml:226
122145msgid "Well done"
@@ -127,87 +150,78 @@ msgid ""
127150"You have now mastered the edge gestures and can start using the "
128151"phone<br><br>Tap on the screen to start"
129152msgstr ""
130−"여러분은 끝에서 끌어오기 제스쳐를 완벽히 익히셨기 때문에 휴대 전화를 사용하기 시작할 수 있습니다. <br><br> 스크린을 터치해서 "
131−"시작하세요."
132−
133−#: qml/Components/Lockscreen.qml:167
134−msgid "Please wait"
135−msgstr "기다려주십시오"
153+"여러분은 가장자리에서 끌어오기 제스쳐를 완벽히 익히셨고 휴대 전화를 사용할 수 있습니다. <br><br> 스크린을 터치해서 시작하세요."
136154
137−#: qml/Components/Lockscreen.qml:172
138−msgid "Too many incorrect attempts"
139−msgstr "너무 많이 틀리셨습니다"
140−
141−#: qml/Components/Lockscreen.qml:206
155+#: qml/Components/Lockscreen.qml:218
142156msgid "Emergency Call"
143157msgstr "긴급 통화"
144158
145−#: qml/Components/Lockscreen.qml:226
159+#: qml/Components/Lockscreen.qml:250
146160msgid "OK"
147161msgstr "확인"
148162
149−#: qml/Components/PassphraseLockscreen.qml:61
150−#, qt-format
151−msgid "Hello %1"
152−msgstr "안녕하세요 %1"
153−
154−#: qml/Components/PassphraseLockscreen.qml:61
155−msgid "Hello"
156−msgstr "안녕하세요"
157−
158−#: qml/Dash/GenericScopeView.qml:361
163+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
159164msgid "See less"
160−msgstr "간단히 표시하기"
165+msgstr "간단히 표시"
161166
162−#: qml/Dash/GenericScopeView.qml:361
167+#: qml/Dash/GenericScopeView.qml:411
163168msgid "See all"
164169msgstr "모두 보기"
165170
166−#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
171+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
172+#: qml/Panel/SearchIndicator.qml:27
167173msgid "Search"
168174msgstr "검색"
169175
170−#: qml/Dash/PageHeader.qml:270
176+#: qml/Dash/PageHeader.qml:268
171177msgid "Settings"
172−msgstr ""
178+msgstr "설정"
173179
174−#: qml/Dash/PageHeader.qml:279
180+#: qml/Dash/PageHeader.qml:275
175181msgid "Remove from Favorites"
176−msgstr ""
182+msgstr "즐겨찾기에서 제거"
177183
178−#: qml/Dash/PageHeader.qml:279
184+#: qml/Dash/PageHeader.qml:275
179185msgid "Add to Favorites"
180−msgstr ""
186+msgstr "즐겨찾기에 추가"
181187
182−#: qml/Dash/Previews/PreviewActionCombo.qml:34
188+#: qml/Dash/Previews/PreviewActionCombo.qml:35
183189msgid "More..."
184190msgstr "더 보기..."
185191
186−#: qml/Dash/Previews/PreviewActionCombo.qml:34
192+#: qml/Dash/Previews/PreviewActionCombo.qml:35
187193msgid "Less..."
188194msgstr "간단하게..."
189195
190196#: qml/Dash/Previews/PreviewRatingInput.qml:81
191197msgid "Rate this"
192−msgstr "이 애플리케이션 평가하기"
198+msgstr "이 프로그램 평가"
193199
194200#: qml/Dash/Previews/PreviewRatingInput.qml:126
195201msgid "Add a review"
196−msgstr "평가 제출하기"
202+msgstr "평가 추가"
197203
198204#: qml/Dash/Previews/PreviewRatingInput.qml:166
199205msgid "Send"
200206msgstr "보내기"
201207
202−#: qml/Dash/ScopesOverview.qml:201
203−msgid "Manage Dash"
204−msgstr "대시 관리"
208+#: qml/Dash/PullToRefreshScopeStyle.qml:55
209+msgid "Pull to refresh…"
210+msgstr "당기면 새로 고침..."
211+
212+#: qml/Dash/PullToRefreshScopeStyle.qml:60
213+msgid "Release to refresh…"
214+msgstr "놓으면 새로 고침..."
205215
206−#: qml/Dash/ScopesOverview.qml:408
216+#: qml/Dash/ScopesOverview.qml:206
217+msgid "Manage Scopes"
218+msgstr "스코프 관리"
219+
220+#: qml/Dash/ScopesOverview.qml:428
207221msgid "Done"
208222msgstr "완료"
209223
210−#: qml/Dash/ScopesOverview.qml:434
224+#: qml/Dash/ScopesOverview.qml:454
211225msgid "Store"
212226msgstr "장터"
213227
@@ -220,10 +234,10 @@ msgid "All"
220234msgstr "모두"
221235
222236#: qml/Greeter/Greeter.qml:157
223−msgid "Swipe to unlock"
224−msgstr "휴대전화를 잠금 해제하려면 움직이세요."
237+msgid "Unlock"
238+msgstr "잠금 해제"
225239
226−#: qml/Hud/HudParametrizedActionsPage.qml:132
240+#: qml/Hud/HudParametrizedActionsPage.qml:139
227241msgid "Confirm"
228242msgstr "확인"
229243
@@ -233,7 +247,7 @@ msgstr "명령을 입력하거나 말하세요."
233247
234248#: qml/Hud/Hud.qml:84
235249msgid "Loading. Please Wait..."
236−msgstr "준비 중.. 잠시만 기다려 주세요..."
250+msgstr "불러오는 중 입니다. 짐시 기다려주십시오..."
237251
238252#: qml/Hud/Hud.qml:89
239253msgid "Speak Now..."
@@ -243,17 +257,17 @@ msgstr "지금 말하세요..."
243257msgid "Speaking..."
244258msgstr "말하는 중..."
245259
246−#: qml/Notifications/NotificationMenuItemFactory.qml:105
260+#: qml/Notifications/NotificationMenuItemFactory.qml:108
247261msgid "Show password"
248−msgstr "비밀 번호 보기"
262+msgstr "암호 표시"
249263
250−#: qml/Notifications/NotificationMenuItemFactory.qml:120
264+#: qml/Notifications/NotificationMenuItemFactory.qml:124
251265msgid "Enter SIM PIN"
252−msgstr ""
266+msgstr "심 카드의 개인 식별 번호 입력"
253267
254−#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
268+#: qml/Notifications/NotificationMenuItemFactory.qml:125
255269msgid "Sorry, incorrect PIN"
256−msgstr ""
270+msgstr "죄송합니다. 개인 식별 번호가 올바르지 않습니다."
257271
258272#: qml/Panel/ActiveCallHint.qml:77
259273msgid "Tap to return to call..."
@@ -263,92 +277,118 @@ msgstr "통화로 돌아가려면 터치하세요..."
263277msgid "Conference"
264278msgstr "회의"
265279
266−#: qml/Panel/Indicators/MenuItemFactory.qml:651
280+#: qml/Panel/Indicators/MenuItemFactory.qml:600
281+msgid "Nothing is playing"
282+msgstr "연주하는 항목 없음"
283+
284+#: qml/Panel/Indicators/MenuItemFactory.qml:748
267285msgid "In queue…"
268−msgstr "재생 중..."
286+msgstr "대기 중..."
269287
270−#: qml/Panel/Indicators/MenuItemFactory.qml:655
288+#: qml/Panel/Indicators/MenuItemFactory.qml:752
271289msgid "Downloading"
272290msgstr "다운로드 중"
273291
274−#: qml/Panel/Indicators/MenuItemFactory.qml:657
292+#: qml/Panel/Indicators/MenuItemFactory.qml:754
275293msgid "Paused, tap to resume"
276−msgstr "일시 중지 되었습니다. 계속하려면 누르세요."
294+msgstr "일시 중지하였습니다. 계속하려면 눌러주세요."
277295
278−#: qml/Panel/Indicators/MenuItemFactory.qml:659
296+#: qml/Panel/Indicators/MenuItemFactory.qml:756
279297msgid "Canceled"
280−msgstr "취소됨"
298+msgstr "취소함"
281299
282−#: qml/Panel/Indicators/MenuItemFactory.qml:661
300+#: qml/Panel/Indicators/MenuItemFactory.qml:758
283301msgid "Finished"
284−msgstr "완료됨"
302+msgstr "완료함"
285303
286−#: qml/Panel/Indicators/MenuItemFactory.qml:663
304+#: qml/Panel/Indicators/MenuItemFactory.qml:760
287305msgid "Failed, tap to retry"
288−msgstr "실패하였습니다. 재시도하려면 누르세요."
306+msgstr "실패, 누르면 다시 시도합니다."
289307
290308#: qml/Panel/Indicators/ModemInfoItem.qml:105
291309msgid "Unlock SIM"
292−msgstr "SIM 카드 보안 해제"
310+msgstr "심 카드 잠금 해제"
293311
294312#: qml/Panel/Indicators/RoamingIndication.qml:27
295313msgid "Roaming"
296314msgstr "로밍"
297315
298−#: qml/Shell.qml:266
299−msgid "Enter your passphrase"
300−msgstr ""
316+#: qml/Shell.qml:340
317+msgid "Enter passphrase"
318+msgstr "패스프레이즈를 입력해주십시오."
301319
302−#: qml/Shell.qml:267
320+#: qml/Shell.qml:341
303321msgid "Sorry, incorrect passphrase"
304−msgstr ""
322+msgstr "죄송합니다. 패스프레이즈가 올바르지 않습니다."
305323
306−#: qml/Shell.qml:282
307−msgid "Enter your passcode"
308−msgstr ""
324+#: qml/Shell.qml:342
325+msgid "Please re-enter"
326+msgstr "다시 입력해주십시오."
327+
328+#: qml/Shell.qml:344
329+msgid "Enter passcode"
330+msgstr "패스코드를 입력해주십시오."
309331
310−#: qml/Shell.qml:283
332+#: qml/Shell.qml:345
311333msgid "Sorry, incorrect passcode"
312−msgstr ""
334+msgstr "죄송합니다. 패스코드가 올바르지 않습니다."
313335
314−#: qml/Shell.qml:273
336+#: qml/Shell.qml:348
315337#, qt-format
316−msgid "Enter your %1"
317−msgstr "%1를 입력하세요"
338+msgid "Enter %1"
339+msgstr "%1 입력"
318340
319−#: qml/Shell.qml:274
341+#: qml/Shell.qml:349
320342#, qt-format
321343msgid "Sorry, incorrect %1"
322−msgstr ""
344+msgstr "죄송합니다. %1이(가) 올바르지 않습니다."
323345
324−#: qml/Shell.qml:310
346+#: qml/Shell.qml:384
325347msgid "Sorry, incorrect passphrase."
326−msgstr "잘못된 비밀번호입니다."
348+msgstr "올바르지 않은 패스프레이즈입니다."
327349
328−#: qml/Shell.qml:311
350+#: qml/Shell.qml:385
329351msgid "Sorry, incorrect passcode."
330−msgstr "잘못된 비밀번호입니다."
352+msgstr "최송합니다. 패스코드가 올바르지 않습니다."
331353
332−#: qml/Shell.qml:312
354+#: qml/Shell.qml:386
333355msgid "This will be your last attempt."
334356msgstr "마지막 시도입니다."
335357
336−#: qml/Shell.qml:314
358+#: qml/Shell.qml:388
337359msgid ""
338360"If passphrase is entered incorrectly, your phone will conduct a factory "
339361"reset and all personal data will be deleted."
340−msgstr ""
341−"만약 이번 시도에서 잘못 입력하면, 보안을 위해 휴대 전화가 공장 초기화 과정을 거쳐 모든 사용자 데이터를 삭제할 것입니다."
362+msgstr "이번에도 올바르지 않은 패스프레이즈를 입력하면 휴대 전화를 공장 초기화하여 모든 개인 정보를 삭제합니다."
342363
343−#: qml/Shell.qml:315
364+#: qml/Shell.qml:389
344365msgid ""
345366"If passcode is entered incorrectly, your phone will conduct a factory reset "
346367"and all personal data will be deleted."
347−msgstr ""
348−"만약 이번 시도에서 잘못 입력하면, 보안을 위해 휴대 전화가 공장 초기화 과정을 거쳐 모든 사용자 데이터를 삭제할 것입니다."
368+msgstr "이번에도 올바르지 않은 패스코드를 입력하면 휴대 전화를 공장 초기화하여 모든 개인 정보를 삭제합니다."
369+
370+#, qt-format
371+#~ msgid "Hello %1"
372+#~ msgstr "안녕하세요 %1"
373+
374+#~ msgid "Hello"
375+#~ msgstr "안녕하세요"
349376
350−#~ msgid "Are you sure you would like to turn power off?"
351−#~ msgstr "정말로 전원을 끌까요?"
377+#~ msgid "Please wait"
378+#~ msgstr "기다려주십시오"
352379
353−#~ msgid "Restart"
354−#~ msgstr "재시작"
380+#~ msgid "Too many incorrect attempts"
381+#~ msgstr "너무 많이 틀리셨습니다"
382+
383+#~ msgid "Enter your passphrase"
384+#~ msgstr "패스프레이즈를 입력해주십시오."
385+
386+#~ msgid "Enter your passcode"
387+#~ msgstr "패스코드를 입력해주십시오."
388+
389+#~ msgid "Swipe to unlock"
390+#~ msgstr "쓸어서 잠금 해제"
391+
392+#, qt-format
393+#~ msgid "Enter your %1"
394+#~ msgstr "%1을(를) 입력해주십시오."
po/ku.ponew file+401
@@ -0,0 +1,401 @@
1+# Kurdish translation for unity8
2+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
3+# This file is distributed under the same license as the unity8 package.
4+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
5+#
6+msgid ""
7+msgstr ""
8+"Project-Id-Version: unity8\n"
9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
11+"PO-Revision-Date: 2014-09-10 13:14+0000\n"
12+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13+"Language-Team: Kurdish <ku@li.org>\n"
14+"MIME-Version: 1.0\n"
15+"Content-Type: text/plain; charset=UTF-8\n"
16+"Content-Transfer-Encoding: 8bit\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"
19+"X-Generator: Launchpad (build 17196)\n"
20+
21+#: plugins/LightDM/Greeter.cpp:130
22+msgid "Password: "
23+msgstr "Şîfre: "
24+
25+#: plugins/Unity/Launcher/launcheritem.cpp:45
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
27+msgid "Pin shortcut"
28+msgstr "Kurteriyê pêveke"
29+
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
31+msgid "Unpin shortcut"
32+msgstr "Derzîdanka kurteriyê rake"
33+
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
53+#: qml/Components/Dialogs.qml:70
54+msgid "Log out"
55+msgstr "Derkeve"
56+
57+#: qml/Components/Dialogs.qml:71
58+msgid "Are you sure you want to log out?"
59+msgstr "Ji dil dixwazî derkevî?"
60+
61+#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97
62+#: qml/Components/Dialogs.qml:122
63+msgid "No"
64+msgstr "Na"
65+
66+#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104
67+#: qml/Components/Dialogs.qml:129
68+msgid "Yes"
69+msgstr "Erê"
70+
71+#: qml/Components/Dialogs.qml:94
72+msgid "Shut down"
73+msgstr "Bigire"
74+
75+#: qml/Components/Dialogs.qml:95
76+msgid "Are you sure you want to shut down?"
77+msgstr "Ji dil dixwazî bigirî?"
78+
79+#: qml/Components/Dialogs.qml:119
80+msgid "Reboot"
81+msgstr "Dîsdestpêkirin"
82+
83+#: qml/Components/Dialogs.qml:120
84+msgid "Are you sure you want to reboot?"
85+msgstr "Ji dil dixwazî bidî destpêkirin?"
86+
87+#: qml/Components/Dialogs.qml:144
88+msgid "Power"
89+msgstr "Hêz"
90+
91+#: qml/Components/Dialogs.qml:145
92+msgid ""
93+"Are you sure you would like\n"
94+"to power off?"
95+msgstr ""
96+"Ji dil dixwazî\n"
97+"kompîturê bigirî?"
98+
99+#: qml/Components/Dialogs.qml:147
100+msgid "Power off"
101+msgstr "Bigire"
102+
103+#: qml/Components/Dialogs.qml:157
104+msgid "Restart"
105+msgstr ""
106+
107+#: qml/Components/Dialogs.qml:167
108+msgid "Cancel"
109+msgstr "Betal bike"
110+
111+#: qml/Components/EdgeDemoOverlay.qml:151
112+msgid "Skip intro"
113+msgstr "Danasînê derbas bike"
114+
115+#: qml/Components/EdgeDemo.qml:112
116+msgid "Right edge"
117+msgstr "Kêleka rastê"
118+
119+#: qml/Components/EdgeDemo.qml:113
120+msgid "Try swiping from the right edge to unlock the phone"
121+msgstr "Ji bo kilîdê vekî ji kêleka rastê kaş bike"
122+
123+#: qml/Components/EdgeDemo.qml:144
124+msgid "Top edge"
125+msgstr "Kêleka jorê"
126+
127+#: qml/Components/EdgeDemo.qml:145
128+msgid "Try swiping from the top edge to access the indicators"
129+msgstr "JI bo xwe bigihînî danezanan ji kêleka jorê kaş bike"
130+
131+#: qml/Components/EdgeDemo.qml:170
132+msgid "Close"
133+msgstr "Bigire"
134+
135+#: qml/Components/EdgeDemo.qml:171
136+msgid "Swipe up again to close the settings screen"
137+msgstr "Ji bo girtina ekrana eyaran dîsa bi jorê ve kaş bike"
138+
139+#: qml/Components/EdgeDemo.qml:198
140+msgid "Left edge"
141+msgstr "Kêleka çepê"
142+
143+#: qml/Components/EdgeDemo.qml:199
144+msgid "Swipe from the left to reveal the launcher for quick access to apps"
145+msgstr "Ji bo vekirina gihînera lezgîn ya bernamokan ji kêleka çepê kaş bike"
146+
147+#: qml/Components/EdgeDemo.qml:226
148+msgid "Well done"
149+msgstr "Aferim"
150+
151+#: qml/Components/EdgeDemo.qml:227
152+msgid ""
153+"You have now mastered the edge gestures and can start using the "
154+"phone<br><br>Tap on the screen to start"
155+msgstr ""
156+"Tu tevgerên kêlekê fêr bûyî<br><br>Ji bo destpêkirinê ekranê bipelîne"
157+
158+#: qml/Components/Lockscreen.qml:218
159+msgid "Emergency Call"
160+msgstr "Lêgerîna Lezgîn"
161+
162+#: qml/Components/Lockscreen.qml:250
163+msgid "OK"
164+msgstr "BAŞ E"
165+
166+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
167+msgid "See less"
168+msgstr "Hindiktir bibîne"
169+
170+#: qml/Dash/GenericScopeView.qml:411
171+msgid "See all"
172+msgstr "Tevî bibîne"
173+
174+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
175+#: qml/Panel/SearchIndicator.qml:27
176+msgid "Search"
177+msgstr "Lêgerîn"
178+
179+#: qml/Dash/PageHeader.qml:268
180+msgid "Settings"
181+msgstr "Eyar"
182+
183+#: qml/Dash/PageHeader.qml:275
184+msgid "Remove from Favorites"
185+msgstr "Ji nav Bijareyan rake"
186+
187+#: qml/Dash/PageHeader.qml:275
188+msgid "Add to Favorites"
189+msgstr "Li Bijareyan zêde bike"
190+
191+#: qml/Dash/Previews/PreviewActionCombo.qml:35
192+msgid "More..."
193+msgstr "Zêdetir..."
194+
195+#: qml/Dash/Previews/PreviewActionCombo.qml:35
196+msgid "Less..."
197+msgstr "Hindiktir..."
198+
199+#: qml/Dash/Previews/PreviewRatingInput.qml:81
200+msgid "Rate this"
201+msgstr "Deng bidê"
202+
203+#: qml/Dash/Previews/PreviewRatingInput.qml:126
204+msgid "Add a review"
205+msgstr "Binirxîne"
206+
207+#: qml/Dash/Previews/PreviewRatingInput.qml:166
208+msgid "Send"
209+msgstr "Bişîne"
210+
211+#: qml/Dash/PullToRefreshScopeStyle.qml:55
212+msgid "Pull to refresh…"
213+msgstr ""
214+
215+#: qml/Dash/PullToRefreshScopeStyle.qml:60
216+msgid "Release to refresh…"
217+msgstr ""
218+
219+#: qml/Dash/ScopesOverview.qml:206
220+msgid "Manage Scopes"
221+msgstr ""
222+
223+#: qml/Dash/ScopesOverview.qml:428
224+msgid "Done"
225+msgstr "Qediya"
226+
227+#: qml/Dash/ScopesOverview.qml:454
228+msgid "Store"
229+msgstr "Firoşgeh"
230+
231+#: qml/Dash/ScopesOverviewTab.qml:36
232+msgid "Favorites"
233+msgstr "Bijare"
234+
235+#: qml/Dash/ScopesOverviewTab.qml:54
236+msgid "All"
237+msgstr "Hemû"
238+
239+#: qml/Greeter/Greeter.qml:157
240+msgid "Unlock"
241+msgstr ""
242+
243+#: qml/Hud/HudParametrizedActionsPage.qml:139
244+msgid "Confirm"
245+msgstr "Erê bike"
246+
247+#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
248+msgid "Type or say a command"
249+msgstr "Fermanekê bêje yan binivîse"
250+
251+#: qml/Hud/Hud.qml:84
252+msgid "Loading. Please Wait..."
253+msgstr "Bar dike. Tika ye li bendê bî..."
254+
255+#: qml/Hud/Hud.qml:89
256+msgid "Speak Now..."
257+msgstr "Niha biaxive..."
258+
259+#: qml/Hud/Hud.qml:94
260+msgid "Speaking..."
261+msgstr "Diaxive..."
262+
263+#: qml/Notifications/NotificationMenuItemFactory.qml:108
264+msgid "Show password"
265+msgstr "Şîfreyê nîşan bide"
266+
267+#: qml/Notifications/NotificationMenuItemFactory.qml:124
268+msgid "Enter SIM PIN"
269+msgstr "PINa SIMê binivîse"
270+
271+#: qml/Notifications/NotificationMenuItemFactory.qml:125
272+msgid "Sorry, incorrect PIN"
273+msgstr "Bibore, PIN çewt e"
274+
275+#: qml/Panel/ActiveCallHint.qml:77
276+msgid "Tap to return to call..."
277+msgstr "Ji bo vegerî lêgerînê bipelîne..."
278+
279+#: qml/Panel/ActiveCallHint.qml:90
280+msgid "Conference"
281+msgstr "Konferans"
282+
283+#: qml/Panel/Indicators/MenuItemFactory.qml:600
284+msgid "Nothing is playing"
285+msgstr ""
286+
287+#: qml/Panel/Indicators/MenuItemFactory.qml:748
288+msgid "In queue…"
289+msgstr "Li bendê ye..."
290+
291+#: qml/Panel/Indicators/MenuItemFactory.qml:752
292+msgid "Downloading"
293+msgstr "Jêbar dibe..."
294+
295+#: qml/Panel/Indicators/MenuItemFactory.qml:754
296+msgid "Paused, tap to resume"
297+msgstr "Hat rawestandin, ji bo dewam bike bipelîne"
298+
299+#: qml/Panel/Indicators/MenuItemFactory.qml:756
300+msgid "Canceled"
301+msgstr "Hat betalkirin"
302+
303+#: qml/Panel/Indicators/MenuItemFactory.qml:758
304+msgid "Finished"
305+msgstr "Qediya"
306+
307+#: qml/Panel/Indicators/MenuItemFactory.qml:760
308+msgid "Failed, tap to retry"
309+msgstr "Bi ser neket, ji bo dewam bike bipelîne"
310+
311+#: qml/Panel/Indicators/ModemInfoItem.qml:105
312+msgid "Unlock SIM"
313+msgstr "Kilîda SIMê veke"
314+
315+#: qml/Panel/Indicators/RoamingIndication.qml:27
316+msgid "Roaming"
317+msgstr "Geriyan"
318+
319+#: qml/Shell.qml:340
320+msgid "Enter passphrase"
321+msgstr ""
322+
323+#: qml/Shell.qml:341
324+msgid "Sorry, incorrect passphrase"
325+msgstr "Bibore, parola çewt e"
326+
327+#: qml/Shell.qml:342
328+msgid "Please re-enter"
329+msgstr ""
330+
331+#: qml/Shell.qml:344
332+msgid "Enter passcode"
333+msgstr ""
334+
335+#: qml/Shell.qml:345
336+msgid "Sorry, incorrect passcode"
337+msgstr "Bibore, parola çewrt e"
338+
339+#: qml/Shell.qml:348
340+#, qt-format
341+msgid "Enter %1"
342+msgstr ""
343+
344+#: qml/Shell.qml:349
345+#, qt-format
346+msgid "Sorry, incorrect %1"
347+msgstr "Bibore, %1 çewt e"
348+
349+#: qml/Shell.qml:384
350+msgid "Sorry, incorrect passphrase."
351+msgstr "Bibore, parola çewt e."
352+
353+#: qml/Shell.qml:385
354+msgid "Sorry, incorrect passcode."
355+msgstr "Bibore, parola çewt e."
356+
357+#: qml/Shell.qml:386
358+msgid "This will be your last attempt."
359+msgstr "Ev ê ceribandina dawiyê be."
360+
361+#: qml/Shell.qml:388
362+msgid ""
363+"If passphrase is entered incorrectly, your phone will conduct a factory "
364+"reset and all personal data will be deleted."
365+msgstr ""
366+"Eger parola çewt bê nivîsandin, telefona te dê vegere eyarên fabrîkayê û "
367+"hemû daneyên te yên taybet dê bên jêbirin."
368+
369+#: qml/Shell.qml:389
370+msgid ""
371+"If passcode is entered incorrectly, your phone will conduct a factory reset "
372+"and all personal data will be deleted."
373+msgstr ""
374+"Eger parola çewt bê nivîsandin, telefona te dê vegere eyarên fabrîkayê û "
375+"hemû daneyên te yên taybet dê bên jêbirin."
376+
377+#~ msgid "Please wait"
378+#~ msgstr "Tika ye li bendê bimîne"
379+
380+#, qt-format
381+#~ msgid "Hello %1"
382+#~ msgstr "Silav %1"
383+
384+#~ msgid "Hello"
385+#~ msgstr "Silav"
386+
387+#~ msgid "Too many incorrect attempts"
388+#~ msgstr "Te gelek caran ceribandinên çewt kirin"
389+
390+#~ msgid "Swipe to unlock"
391+#~ msgstr "Ji bo vekirinê kaş bike"
392+
393+#~ msgid "Enter your passphrase"
394+#~ msgstr "Parolaya xwe binivîse"
395+
396+#, qt-format
397+#~ msgid "Enter your %1"
398+#~ msgstr "%1a xwe binivîse"
399+
400+#~ msgid "Enter your passcode"
401+#~ msgstr "Parolaya xwe binivîse"
po/ky.po+89−65
@@ -7,29 +7,49 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-26 18:24+0200\n"
10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
1111"PO-Revision-Date: 2013-06-27 06:17+0000\n"
1212"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"
1313"Language-Team: Kirghiz <ky@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-28 06:30+0000\n"
18−"X-Generator: Launchpad (build 17174)\n"
17+"Plural-Forms: nplurals=1; plural=0;\n"
18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"
19+"X-Generator: Launchpad (build 17196)\n"
1920
20−#: plugins/LightDM/Greeter.cpp:129
21+#: plugins/LightDM/Greeter.cpp:130
2122msgid "Password: "
2223msgstr ""
2324
24−#: plugins/Unity/Launcher/launcheritem.cpp:43
25−#: plugins/Unity/Launcher/launcheritem.cpp:73
25+#: plugins/Unity/Launcher/launcheritem.cpp:45
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
2627msgid "Pin shortcut"
2728msgstr ""
2829
29−#: plugins/Unity/Launcher/launcheritem.cpp:73
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
3031msgid "Unpin shortcut"
3132msgstr ""
3233
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
3353#: qml/Components/Dialogs.qml:70
3454msgid "Log out"
3555msgstr ""
@@ -74,11 +94,15 @@ msgid ""
7494"to power off?"
7595msgstr ""
7696
77−#: qml/Components/Dialogs.qml:144
97+#: qml/Components/Dialogs.qml:147
7898msgid "Power off"
7999msgstr ""
80100
81−#: qml/Components/Dialogs.qml:162
101+#: qml/Components/Dialogs.qml:157
102+msgid "Restart"
103+msgstr ""
104+
105+#: qml/Components/Dialogs.qml:167
82106msgid "Cancel"
83107msgstr ""
84108
@@ -128,60 +152,44 @@ msgid ""
128152"phone<br><br>Tap on the screen to start"
129153msgstr ""
130154
131−#: qml/Components/Lockscreen.qml:167
132−msgid "Please wait"
133−msgstr ""
134−
135−#: qml/Components/Lockscreen.qml:172
136−msgid "Too many incorrect attempts"
137−msgstr ""
138−
139−#: qml/Components/Lockscreen.qml:206
155+#: qml/Components/Lockscreen.qml:218
140156msgid "Emergency Call"
141157msgstr ""
142158
143−#: qml/Components/Lockscreen.qml:226
159+#: qml/Components/Lockscreen.qml:250
144160msgid "OK"
145161msgstr ""
146162
147−#: qml/Components/PassphraseLockscreen.qml:61
148−#, qt-format
149−msgid "Hello %1"
150−msgstr ""
151−
152−#: qml/Components/PassphraseLockscreen.qml:61
153−msgid "Hello"
154−msgstr ""
155−
156−#: qml/Dash/GenericScopeView.qml:361
163+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
157164msgid "See less"
158165msgstr ""
159166
160−#: qml/Dash/GenericScopeView.qml:361
167+#: qml/Dash/GenericScopeView.qml:411
161168msgid "See all"
162169msgstr ""
163170
164−#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
171+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
172+#: qml/Panel/SearchIndicator.qml:27
165173msgid "Search"
166174msgstr "Издөө"
167175
168−#: qml/Dash/PageHeader.qml:270
176+#: qml/Dash/PageHeader.qml:268
169177msgid "Settings"
170178msgstr ""
171179
172−#: qml/Dash/PageHeader.qml:279
180+#: qml/Dash/PageHeader.qml:275
173181msgid "Remove from Favorites"
174182msgstr ""
175183
176−#: qml/Dash/PageHeader.qml:279
184+#: qml/Dash/PageHeader.qml:275
177185msgid "Add to Favorites"
178186msgstr ""
179187
180−#: qml/Dash/Previews/PreviewActionCombo.qml:34
188+#: qml/Dash/Previews/PreviewActionCombo.qml:35
181189msgid "More..."
182190msgstr ""
183191
184−#: qml/Dash/Previews/PreviewActionCombo.qml:34
192+#: qml/Dash/Previews/PreviewActionCombo.qml:35
185193msgid "Less..."
186194msgstr ""
187195
@@ -197,15 +205,23 @@ msgstr ""
197205msgid "Send"
198206msgstr ""
199207
200−#: qml/Dash/ScopesOverview.qml:201
201−msgid "Manage Dash"
208+#: qml/Dash/PullToRefreshScopeStyle.qml:55
209+msgid "Pull to refresh…"
210+msgstr ""
211+
212+#: qml/Dash/PullToRefreshScopeStyle.qml:60
213+msgid "Release to refresh…"
214+msgstr ""
215+
216+#: qml/Dash/ScopesOverview.qml:206
217+msgid "Manage Scopes"
202218msgstr ""
203219
204−#: qml/Dash/ScopesOverview.qml:408
220+#: qml/Dash/ScopesOverview.qml:428
205221msgid "Done"
206222msgstr ""
207223
208−#: qml/Dash/ScopesOverview.qml:434
224+#: qml/Dash/ScopesOverview.qml:454
209225msgid "Store"
210226msgstr ""
211227
@@ -218,10 +234,10 @@ msgid "All"
218234msgstr ""
219235
220236#: qml/Greeter/Greeter.qml:157
221−msgid "Swipe to unlock"
237+msgid "Unlock"
222238msgstr ""
223239
224−#: qml/Hud/HudParametrizedActionsPage.qml:132
240+#: qml/Hud/HudParametrizedActionsPage.qml:139
225241msgid "Confirm"
226242msgstr "Аныктоо"
227243
@@ -241,15 +257,15 @@ msgstr "Азыр сүйлөңүз..."
241257msgid "Speaking..."
242258msgstr "Сүйлөнүүдө..."
243259
244−#: qml/Notifications/NotificationMenuItemFactory.qml:105
260+#: qml/Notifications/NotificationMenuItemFactory.qml:108
245261msgid "Show password"
246262msgstr ""
247263
248−#: qml/Notifications/NotificationMenuItemFactory.qml:120
264+#: qml/Notifications/NotificationMenuItemFactory.qml:124
249265msgid "Enter SIM PIN"
250266msgstr ""
251267
252−#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
268+#: qml/Notifications/NotificationMenuItemFactory.qml:125
253269msgid "Sorry, incorrect PIN"
254270msgstr ""
255271
@@ -261,27 +277,31 @@ msgstr ""
261277msgid "Conference"
262278msgstr ""
263279
264−#: qml/Panel/Indicators/MenuItemFactory.qml:651
280+#: qml/Panel/Indicators/MenuItemFactory.qml:600
281+msgid "Nothing is playing"
282+msgstr ""
283+
284+#: qml/Panel/Indicators/MenuItemFactory.qml:748
265285msgid "In queue…"
266286msgstr ""
267287
268−#: qml/Panel/Indicators/MenuItemFactory.qml:655
288+#: qml/Panel/Indicators/MenuItemFactory.qml:752
269289msgid "Downloading"
270290msgstr ""
271291
272−#: qml/Panel/Indicators/MenuItemFactory.qml:657
292+#: qml/Panel/Indicators/MenuItemFactory.qml:754
273293msgid "Paused, tap to resume"
274294msgstr ""
275295
276−#: qml/Panel/Indicators/MenuItemFactory.qml:659
296+#: qml/Panel/Indicators/MenuItemFactory.qml:756
277297msgid "Canceled"
278298msgstr ""
279299
280−#: qml/Panel/Indicators/MenuItemFactory.qml:661
300+#: qml/Panel/Indicators/MenuItemFactory.qml:758
281301msgid "Finished"
282302msgstr ""
283303
284−#: qml/Panel/Indicators/MenuItemFactory.qml:663
304+#: qml/Panel/Indicators/MenuItemFactory.qml:760
285305msgid "Failed, tap to retry"
286306msgstr ""
287307
@@ -293,51 +313,55 @@ msgstr ""
293313msgid "Roaming"
294314msgstr ""
295315
296−#: qml/Shell.qml:266
297−msgid "Enter your passphrase"
316+#: qml/Shell.qml:340
317+msgid "Enter passphrase"
298318msgstr ""
299319
300−#: qml/Shell.qml:267
320+#: qml/Shell.qml:341
301321msgid "Sorry, incorrect passphrase"
302322msgstr ""
303323
304−#: qml/Shell.qml:282
305−msgid "Enter your passcode"
324+#: qml/Shell.qml:342
325+msgid "Please re-enter"
326+msgstr ""
327+
328+#: qml/Shell.qml:344
329+msgid "Enter passcode"
306330msgstr ""
307331
308−#: qml/Shell.qml:283
332+#: qml/Shell.qml:345
309333msgid "Sorry, incorrect passcode"
310334msgstr ""
311335
312−#: qml/Shell.qml:273
336+#: qml/Shell.qml:348
313337#, qt-format
314−msgid "Enter your %1"
338+msgid "Enter %1"
315339msgstr ""
316340
317−#: qml/Shell.qml:274
341+#: qml/Shell.qml:349
318342#, qt-format
319343msgid "Sorry, incorrect %1"
320344msgstr ""
321345
322−#: qml/Shell.qml:310
346+#: qml/Shell.qml:384
323347msgid "Sorry, incorrect passphrase."
324348msgstr ""
325349
326−#: qml/Shell.qml:311
350+#: qml/Shell.qml:385
327351msgid "Sorry, incorrect passcode."
328352msgstr ""
329353
330−#: qml/Shell.qml:312
354+#: qml/Shell.qml:386
331355msgid "This will be your last attempt."
332356msgstr ""
333357
334−#: qml/Shell.qml:314
358+#: qml/Shell.qml:388
335359msgid ""
336360"If passphrase is entered incorrectly, your phone will conduct a factory "
337361"reset and all personal data will be deleted."
338362msgstr ""
339363
340−#: qml/Shell.qml:315
364+#: qml/Shell.qml:389
341365msgid ""
342366"If passcode is entered incorrectly, your phone will conduct a factory reset "
343367"and all personal data will be deleted."
po/lo.po+96−65
@@ -7,29 +7,49 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-26 18:24+0200\n"
10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
1111"PO-Revision-Date: 2013-10-02 10:00+0000\n"
1212"Last-Translator: Anousak <anousak@gmail.com>\n"
1313"Language-Team: Lao <lo@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-28 06:30+0000\n"
18−"X-Generator: Launchpad (build 17174)\n"
17+"Plural-Forms: nplurals=1; plural=0;\n"
18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"
19+"X-Generator: Launchpad (build 17196)\n"
1920
20−#: plugins/LightDM/Greeter.cpp:129
21+#: plugins/LightDM/Greeter.cpp:130
2122msgid "Password: "
2223msgstr ""
2324
24−#: plugins/Unity/Launcher/launcheritem.cpp:43
25−#: plugins/Unity/Launcher/launcheritem.cpp:73
25+#: plugins/Unity/Launcher/launcheritem.cpp:45
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
2627msgid "Pin shortcut"
2728msgstr ""
2829
29−#: plugins/Unity/Launcher/launcheritem.cpp:73
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
3031msgid "Unpin shortcut"
3132msgstr ""
3233
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
3353#: qml/Components/Dialogs.qml:70
3454msgid "Log out"
3555msgstr ""
@@ -74,11 +94,15 @@ msgid ""
7494"to power off?"
7595msgstr ""
7696
77−#: qml/Components/Dialogs.qml:144
97+#: qml/Components/Dialogs.qml:147
7898msgid "Power off"
7999msgstr ""
80100
81−#: qml/Components/Dialogs.qml:162
101+#: qml/Components/Dialogs.qml:157
102+msgid "Restart"
103+msgstr ""
104+
105+#: qml/Components/Dialogs.qml:167
82106msgid "Cancel"
83107msgstr ""
84108
@@ -128,60 +152,44 @@ msgid ""
128152"phone<br><br>Tap on the screen to start"
129153msgstr ""
130154
131−#: qml/Components/Lockscreen.qml:167
132−msgid "Please wait"
133−msgstr ""
134−
135−#: qml/Components/Lockscreen.qml:172
136−msgid "Too many incorrect attempts"
137−msgstr ""
138−
139−#: qml/Components/Lockscreen.qml:206
155+#: qml/Components/Lockscreen.qml:218
140156msgid "Emergency Call"
141157msgstr ""
142158
143−#: qml/Components/Lockscreen.qml:226
159+#: qml/Components/Lockscreen.qml:250
144160msgid "OK"
145161msgstr ""
146162
147−#: qml/Components/PassphraseLockscreen.qml:61
148−#, qt-format
149−msgid "Hello %1"
150−msgstr "ສະບາຍດີ %1"
151−
152−#: qml/Components/PassphraseLockscreen.qml:61
153−msgid "Hello"
154−msgstr "ສະບາຍດີ"
155−
156−#: qml/Dash/GenericScopeView.qml:361
163+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
157164msgid "See less"
158165msgstr ""
159166
160−#: qml/Dash/GenericScopeView.qml:361
167+#: qml/Dash/GenericScopeView.qml:411
161168msgid "See all"
162169msgstr ""
163170
164−#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
171+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
172+#: qml/Panel/SearchIndicator.qml:27
165173msgid "Search"
166174msgstr "ຊອກຫາ"
167175
168−#: qml/Dash/PageHeader.qml:270
176+#: qml/Dash/PageHeader.qml:268
169177msgid "Settings"
170178msgstr ""
171179
172−#: qml/Dash/PageHeader.qml:279
180+#: qml/Dash/PageHeader.qml:275
173181msgid "Remove from Favorites"
174182msgstr ""
175183
176−#: qml/Dash/PageHeader.qml:279
184+#: qml/Dash/PageHeader.qml:275
177185msgid "Add to Favorites"
178186msgstr ""
179187
180−#: qml/Dash/Previews/PreviewActionCombo.qml:34
188+#: qml/Dash/Previews/PreviewActionCombo.qml:35
181189msgid "More..."
182190msgstr ""
183191
184−#: qml/Dash/Previews/PreviewActionCombo.qml:34
192+#: qml/Dash/Previews/PreviewActionCombo.qml:35
185193msgid "Less..."
186194msgstr ""
187195
@@ -197,15 +205,23 @@ msgstr ""
197205msgid "Send"
198206msgstr "ສົ່ງ"
199207
200−#: qml/Dash/ScopesOverview.qml:201
201−msgid "Manage Dash"
208+#: qml/Dash/PullToRefreshScopeStyle.qml:55
209+msgid "Pull to refresh…"
210+msgstr ""
211+
212+#: qml/Dash/PullToRefreshScopeStyle.qml:60
213+msgid "Release to refresh…"
214+msgstr ""
215+
216+#: qml/Dash/ScopesOverview.qml:206
217+msgid "Manage Scopes"
202218msgstr ""
203219
204−#: qml/Dash/ScopesOverview.qml:408
220+#: qml/Dash/ScopesOverview.qml:428
205221msgid "Done"
206222msgstr ""
207223
208−#: qml/Dash/ScopesOverview.qml:434
224+#: qml/Dash/ScopesOverview.qml:454
209225msgid "Store"
210226msgstr ""
211227
@@ -218,10 +234,10 @@ msgid "All"
218234msgstr ""
219235
220236#: qml/Greeter/Greeter.qml:157
221−msgid "Swipe to unlock"
237+msgid "Unlock"
222238msgstr ""
223239
224−#: qml/Hud/HudParametrizedActionsPage.qml:132
240+#: qml/Hud/HudParametrizedActionsPage.qml:139
225241msgid "Confirm"
226242msgstr "ຢືນຢັນ"
227243
@@ -241,15 +257,15 @@ msgstr "ເວົ້າໂລດ"
241257msgid "Speaking..."
242258msgstr "ກໍາລັງເວົ້າ"
243259
244−#: qml/Notifications/NotificationMenuItemFactory.qml:105
260+#: qml/Notifications/NotificationMenuItemFactory.qml:108
245261msgid "Show password"
246262msgstr ""
247263
248−#: qml/Notifications/NotificationMenuItemFactory.qml:120
264+#: qml/Notifications/NotificationMenuItemFactory.qml:124
249265msgid "Enter SIM PIN"
250266msgstr ""
251267
252−#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
268+#: qml/Notifications/NotificationMenuItemFactory.qml:125
253269msgid "Sorry, incorrect PIN"
254270msgstr ""
255271
@@ -261,27 +277,31 @@ msgstr ""
261277msgid "Conference"
262278msgstr ""
263279
264−#: qml/Panel/Indicators/MenuItemFactory.qml:651
280+#: qml/Panel/Indicators/MenuItemFactory.qml:600
281+msgid "Nothing is playing"
282+msgstr ""
283+
284+#: qml/Panel/Indicators/MenuItemFactory.qml:748
265285msgid "In queue…"
266286msgstr ""
267287
268−#: qml/Panel/Indicators/MenuItemFactory.qml:655
288+#: qml/Panel/Indicators/MenuItemFactory.qml:752
269289msgid "Downloading"
270290msgstr ""
271291
272−#: qml/Panel/Indicators/MenuItemFactory.qml:657
292+#: qml/Panel/Indicators/MenuItemFactory.qml:754
273293msgid "Paused, tap to resume"
274294msgstr ""
275295
276−#: qml/Panel/Indicators/MenuItemFactory.qml:659
296+#: qml/Panel/Indicators/MenuItemFactory.qml:756
277297msgid "Canceled"
278298msgstr ""
279299
280−#: qml/Panel/Indicators/MenuItemFactory.qml:661
300+#: qml/Panel/Indicators/MenuItemFactory.qml:758
281301msgid "Finished"
282302msgstr ""
283303
284−#: qml/Panel/Indicators/MenuItemFactory.qml:663
304+#: qml/Panel/Indicators/MenuItemFactory.qml:760
285305msgid "Failed, tap to retry"
286306msgstr ""
287307
@@ -293,52 +313,63 @@ msgstr ""
293313msgid "Roaming"
294314msgstr ""
295315
296−#: qml/Shell.qml:266
297−msgid "Enter your passphrase"
316+#: qml/Shell.qml:340
317+msgid "Enter passphrase"
298318msgstr ""
299319
300−#: qml/Shell.qml:267
320+#: qml/Shell.qml:341
301321msgid "Sorry, incorrect passphrase"
302322msgstr ""
303323
304−#: qml/Shell.qml:282
305−msgid "Enter your passcode"
324+#: qml/Shell.qml:342
325+msgid "Please re-enter"
326+msgstr ""
327+
328+#: qml/Shell.qml:344
329+msgid "Enter passcode"
306330msgstr ""
307331
308−#: qml/Shell.qml:283
332+#: qml/Shell.qml:345
309333msgid "Sorry, incorrect passcode"
310334msgstr ""
311335
312−#: qml/Shell.qml:273
336+#: qml/Shell.qml:348
313337#, qt-format
314−msgid "Enter your %1"
338+msgid "Enter %1"
315339msgstr ""
316340
317−#: qml/Shell.qml:274
341+#: qml/Shell.qml:349
318342#, qt-format
319343msgid "Sorry, incorrect %1"
320344msgstr ""
321345
322−#: qml/Shell.qml:310
346+#: qml/Shell.qml:384
323347msgid "Sorry, incorrect passphrase."
324348msgstr ""
325349
326−#: qml/Shell.qml:311
350+#: qml/Shell.qml:385
327351msgid "Sorry, incorrect passcode."
328352msgstr ""
329353
330−#: qml/Shell.qml:312
354+#: qml/Shell.qml:386
331355msgid "This will be your last attempt."
332356msgstr ""
333357
334−#: qml/Shell.qml:314
358+#: qml/Shell.qml:388
335359msgid ""
336360"If passphrase is entered incorrectly, your phone will conduct a factory "
337361"reset and all personal data will be deleted."
338362msgstr ""
339363
340−#: qml/Shell.qml:315
364+#: qml/Shell.qml:389
341365msgid ""
342366"If passcode is entered incorrectly, your phone will conduct a factory reset "
343367"and all personal data will be deleted."
344368msgstr ""
369+
370+#, qt-format
371+#~ msgid "Hello %1"
372+#~ msgstr "ສະບາຍດີ %1"
373+
374+#~ msgid "Hello"
375+#~ msgstr "ສະບາຍດີ"
po/lt.po+101−66
@@ -7,29 +7,50 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-26 18:24+0200\n"
10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
1111"PO-Revision-Date: 2014-05-19 17:15+0000\n"
1212"Last-Translator: Mantas Kriaučiūnas <mantas@akl.lt>\n"
1313"Language-Team: Lithuanian <lt@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-28 06:30+0000\n"
18−"X-Generator: Launchpad (build 17174)\n"
17+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
18+"(n%100<10 || n%100>=20) ? 1 : 2;\n"
19+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"
20+"X-Generator: Launchpad (build 17196)\n"
1921
20−#: plugins/LightDM/Greeter.cpp:129
22+#: plugins/LightDM/Greeter.cpp:130
2123msgid "Password: "
2224msgstr ""
2325
24−#: plugins/Unity/Launcher/launcheritem.cpp:43
25−#: plugins/Unity/Launcher/launcheritem.cpp:73
26+#: plugins/Unity/Launcher/launcheritem.cpp:45
27+#: plugins/Unity/Launcher/launcheritem.cpp:91
2628msgid "Pin shortcut"
2729msgstr ""
2830
29−#: plugins/Unity/Launcher/launcheritem.cpp:73
31+#: plugins/Unity/Launcher/launcheritem.cpp:91
3032msgid "Unpin shortcut"
3133msgstr ""
3234
35+#: qml/Components/DelayedLockscreen.qml:47
36+msgid "Device Locked"
37+msgstr ""
38+
39+#: qml/Components/DelayedLockscreen.qml:62
40+msgid "You have been locked out due to too many failed passphrase attempts."
41+msgstr ""
42+
43+#: qml/Components/DelayedLockscreen.qml:63
44+msgid "You have been locked out due to too many failed passcode attempts."
45+msgstr ""
46+
47+#: qml/Components/DelayedLockscreen.qml:72
48+#, qt-format
49+msgid "Please wait %1 minute and then try again…"
50+msgid_plural "Please wait %1 minutes and then try again…"
51+msgstr[0] ""
52+msgstr[1] ""
53+
3354#: qml/Components/Dialogs.qml:70
3455msgid "Log out"
3556msgstr ""
@@ -74,11 +95,15 @@ msgid ""
7495"to power off?"
7596msgstr ""
7697
77−#: qml/Components/Dialogs.qml:144
98+#: qml/Components/Dialogs.qml:147
7899msgid "Power off"
79100msgstr ""
80101
81−#: qml/Components/Dialogs.qml:162
102+#: qml/Components/Dialogs.qml:157
103+msgid "Restart"
104+msgstr ""
105+
106+#: qml/Components/Dialogs.qml:167
82107msgid "Cancel"
83108msgstr ""
84109
@@ -131,60 +156,44 @@ msgid ""
131156"phone<br><br>Tap on the screen to start"
132157msgstr ""
133158
134−#: qml/Components/Lockscreen.qml:167
135−msgid "Please wait"
136−msgstr ""
137−
138−#: qml/Components/Lockscreen.qml:172
139−msgid "Too many incorrect attempts"
140−msgstr ""
141−
142−#: qml/Components/Lockscreen.qml:206
159+#: qml/Components/Lockscreen.qml:218
143160msgid "Emergency Call"
144161msgstr "Pagalbos skambutis"
145162
146−#: qml/Components/Lockscreen.qml:226
163+#: qml/Components/Lockscreen.qml:250
147164msgid "OK"
148165msgstr ""
149166
150−#: qml/Components/PassphraseLockscreen.qml:61
151−#, qt-format
152−msgid "Hello %1"
153−msgstr "Laba diena, %1"
154−
155−#: qml/Components/PassphraseLockscreen.qml:61
156−msgid "Hello"
157−msgstr "Sveiki"
158−
159−#: qml/Dash/GenericScopeView.qml:361
167+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
160168msgid "See less"
161169msgstr ""
162170
163−#: qml/Dash/GenericScopeView.qml:361
171+#: qml/Dash/GenericScopeView.qml:411
164172msgid "See all"
165173msgstr ""
166174
167−#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
175+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
176+#: qml/Panel/SearchIndicator.qml:27
168177msgid "Search"
169178msgstr "Paieška"
170179
171−#: qml/Dash/PageHeader.qml:270
180+#: qml/Dash/PageHeader.qml:268
172181msgid "Settings"
173182msgstr ""
174183
175−#: qml/Dash/PageHeader.qml:279
184+#: qml/Dash/PageHeader.qml:275
176185msgid "Remove from Favorites"
177186msgstr ""
178187
179−#: qml/Dash/PageHeader.qml:279
188+#: qml/Dash/PageHeader.qml:275
180189msgid "Add to Favorites"
181190msgstr ""
182191
183−#: qml/Dash/Previews/PreviewActionCombo.qml:34
192+#: qml/Dash/Previews/PreviewActionCombo.qml:35
184193msgid "More..."
185194msgstr "Daugiau..."
186195
187−#: qml/Dash/Previews/PreviewActionCombo.qml:34
196+#: qml/Dash/Previews/PreviewActionCombo.qml:35
188197msgid "Less..."
189198msgstr "Mažiau..."
190199
@@ -200,15 +209,23 @@ msgstr "Pridėkite apžvalgą"
200209msgid "Send"
201210msgstr "Siųsti"
202211
203−#: qml/Dash/ScopesOverview.qml:201
204−msgid "Manage Dash"
212+#: qml/Dash/PullToRefreshScopeStyle.qml:55
213+msgid "Pull to refresh…"
214+msgstr ""
215+
216+#: qml/Dash/PullToRefreshScopeStyle.qml:60
217+msgid "Release to refresh…"
205218msgstr ""
206219
207−#: qml/Dash/ScopesOverview.qml:408
220+#: qml/Dash/ScopesOverview.qml:206
221+msgid "Manage Scopes"
222+msgstr ""
223+
224+#: qml/Dash/ScopesOverview.qml:428
208225msgid "Done"
209226msgstr ""
210227
211−#: qml/Dash/ScopesOverview.qml:434
228+#: qml/Dash/ScopesOverview.qml:454
212229msgid "Store"
213230msgstr ""
214231
@@ -221,10 +238,10 @@ msgid "All"
221238msgstr ""
222239
223240#: qml/Greeter/Greeter.qml:157
224−msgid "Swipe to unlock"
225−msgstr "Braukite ir atrakinsite"
241+msgid "Unlock"
242+msgstr ""
226243
227−#: qml/Hud/HudParametrizedActionsPage.qml:132
244+#: qml/Hud/HudParametrizedActionsPage.qml:139
228245msgid "Confirm"
229246msgstr "Patvirtinti"
230247
@@ -244,15 +261,15 @@ msgstr "Kalbėkite..."
244261msgid "Speaking..."
245262msgstr "Kalbama..."
246263
247−#: qml/Notifications/NotificationMenuItemFactory.qml:105
264+#: qml/Notifications/NotificationMenuItemFactory.qml:108
248265msgid "Show password"
249266msgstr "Rodyti slaptažodį"
250267
251−#: qml/Notifications/NotificationMenuItemFactory.qml:120
268+#: qml/Notifications/NotificationMenuItemFactory.qml:124
252269msgid "Enter SIM PIN"
253270msgstr ""
254271
255−#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
272+#: qml/Notifications/NotificationMenuItemFactory.qml:125
256273msgid "Sorry, incorrect PIN"
257274msgstr ""
258275
@@ -264,27 +281,31 @@ msgstr ""
264281msgid "Conference"
265282msgstr ""
266283
267−#: qml/Panel/Indicators/MenuItemFactory.qml:651
284+#: qml/Panel/Indicators/MenuItemFactory.qml:600
285+msgid "Nothing is playing"
286+msgstr ""
287+
288+#: qml/Panel/Indicators/MenuItemFactory.qml:748
268289msgid "In queue…"
269290msgstr ""
270291
271−#: qml/Panel/Indicators/MenuItemFactory.qml:655
292+#: qml/Panel/Indicators/MenuItemFactory.qml:752
272293msgid "Downloading"
273294msgstr ""
274295
275−#: qml/Panel/Indicators/MenuItemFactory.qml:657
296+#: qml/Panel/Indicators/MenuItemFactory.qml:754
276297msgid "Paused, tap to resume"
277298msgstr ""
278299
279−#: qml/Panel/Indicators/MenuItemFactory.qml:659
300+#: qml/Panel/Indicators/MenuItemFactory.qml:756
280301msgid "Canceled"
281302msgstr ""
282303
283−#: qml/Panel/Indicators/MenuItemFactory.qml:661
304+#: qml/Panel/Indicators/MenuItemFactory.qml:758
284305msgid "Finished"
285306msgstr ""
286307
287−#: qml/Panel/Indicators/MenuItemFactory.qml:663
308+#: qml/Panel/Indicators/MenuItemFactory.qml:760
288309msgid "Failed, tap to retry"
289310msgstr ""
290311
@@ -296,52 +317,66 @@ msgstr ""
296317msgid "Roaming"
297318msgstr ""
298319
299−#: qml/Shell.qml:266
300−msgid "Enter your passphrase"
320+#: qml/Shell.qml:340
321+msgid "Enter passphrase"
301322msgstr ""
302323
303−#: qml/Shell.qml:267
324+#: qml/Shell.qml:341
304325msgid "Sorry, incorrect passphrase"
305326msgstr ""
306327
307−#: qml/Shell.qml:282
308−msgid "Enter your passcode"
328+#: qml/Shell.qml:342
329+msgid "Please re-enter"
330+msgstr ""
331+
332+#: qml/Shell.qml:344
333+msgid "Enter passcode"
309334msgstr ""
310335
311−#: qml/Shell.qml:283
336+#: qml/Shell.qml:345
312337msgid "Sorry, incorrect passcode"
313338msgstr ""
314339
315−#: qml/Shell.qml:273
340+#: qml/Shell.qml:348
316341#, qt-format
317−msgid "Enter your %1"
342+msgid "Enter %1"
318343msgstr ""
319344
320−#: qml/Shell.qml:274
345+#: qml/Shell.qml:349
321346#, qt-format
322347msgid "Sorry, incorrect %1"
323348msgstr ""
324349
325−#: qml/Shell.qml:310
350+#: qml/Shell.qml:384
326351msgid "Sorry, incorrect passphrase."
327352msgstr ""
328353
329−#: qml/Shell.qml:311
354+#: qml/Shell.qml:385
330355msgid "Sorry, incorrect passcode."
331356msgstr ""
332357
333−#: qml/Shell.qml:312
358+#: qml/Shell.qml:386
334359msgid "This will be your last attempt."
335360msgstr ""
336361
337−#: qml/Shell.qml:314
362+#: qml/Shell.qml:388
338363msgid ""
339364"If passphrase is entered incorrectly, your phone will conduct a factory "
340365"reset and all personal data will be deleted."
341366msgstr ""
342367
343−#: qml/Shell.qml:315
368+#: qml/Shell.qml:389
344369msgid ""
345370"If passcode is entered incorrectly, your phone will conduct a factory reset "
346371"and all personal data will be deleted."
347372msgstr ""
373+
374+#, qt-format
375+#~ msgid "Hello %1"
376+#~ msgstr "Laba diena, %1"
377+
378+#~ msgid "Hello"
379+#~ msgstr "Sveiki"
380+
381+#~ msgid "Swipe to unlock"
382+#~ msgstr "Braukite ir atrakinsite"
po/lv.po+112−80
@@ -7,32 +7,52 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-26 18:24+0200\n"
10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
1111"PO-Revision-Date: 2014-08-21 09:46+0000\n"
1212"Last-Translator: Jānis-Marks Gailis <jm-gailis@fai-vianet.fr>\n"
1313"Language-Team: Latvian <lv@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-28 06:30+0000\n"
18−"X-Generator: Launchpad (build 17174)\n"
17+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"
18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"
19+"X-Generator: Launchpad (build 17196)\n"
1920
20−#: plugins/LightDM/Greeter.cpp:129
21+#: plugins/LightDM/Greeter.cpp:130
2122msgid "Password: "
2223msgstr "Parole: "
2324
24−#: plugins/Unity/Launcher/launcheritem.cpp:43
25−#: plugins/Unity/Launcher/launcheritem.cpp:73
25+#: plugins/Unity/Launcher/launcheritem.cpp:45
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
2627msgid "Pin shortcut"
2728msgstr ""
2829
29−#: plugins/Unity/Launcher/launcheritem.cpp:73
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
3031msgid "Unpin shortcut"
3132msgstr ""
3233
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
3353#: qml/Components/Dialogs.qml:70
3454msgid "Log out"
35−msgstr ""
55+msgstr "Iziet"
3656
3757#: qml/Components/Dialogs.qml:71
3858msgid "Are you sure you want to log out?"
@@ -41,16 +61,16 @@ msgstr ""
4161#: qml/Components/Dialogs.qml:73 qml/Components/Dialogs.qml:97
4262#: qml/Components/Dialogs.qml:122
4363msgid "No"
44−msgstr ""
64+msgstr "Nē"
4565
4666#: qml/Components/Dialogs.qml:80 qml/Components/Dialogs.qml:104
4767#: qml/Components/Dialogs.qml:129
4868msgid "Yes"
49−msgstr ""
69+msgstr "Jā"
5070
5171#: qml/Components/Dialogs.qml:94
5272msgid "Shut down"
53−msgstr ""
73+msgstr "Izslēgt"
5474
5575#: qml/Components/Dialogs.qml:95
5676msgid "Are you sure you want to shut down?"
@@ -58,7 +78,7 @@ msgstr ""
5878
5979#: qml/Components/Dialogs.qml:119
6080msgid "Reboot"
61−msgstr ""
81+msgstr "Pārstartēt"
6282
6383#: qml/Components/Dialogs.qml:120
6484msgid "Are you sure you want to reboot?"
@@ -66,7 +86,7 @@ msgstr ""
6686
6787#: qml/Components/Dialogs.qml:144
6888msgid "Power"
69−msgstr ""
89+msgstr "Barošana"
7090
7191#: qml/Components/Dialogs.qml:145
7292msgid ""
@@ -74,11 +94,15 @@ msgid ""
7494"to power off?"
7595msgstr ""
7696
77−#: qml/Components/Dialogs.qml:144
97+#: qml/Components/Dialogs.qml:147
7898msgid "Power off"
7999msgstr "Izslēgt"
80100
81−#: qml/Components/Dialogs.qml:162
101+#: qml/Components/Dialogs.qml:157
102+msgid "Restart"
103+msgstr ""
104+
105+#: qml/Components/Dialogs.qml:167
82106msgid "Cancel"
83107msgstr "Atcelt"
84108
@@ -128,60 +152,44 @@ msgid ""
128152"phone<br><br>Tap on the screen to start"
129153msgstr ""
130154
131−#: qml/Components/Lockscreen.qml:167
132−msgid "Please wait"
133−msgstr "Lūdzu, uzgaidiet"
134−
135−#: qml/Components/Lockscreen.qml:172
136−msgid "Too many incorrect attempts"
137−msgstr ""
138−
139−#: qml/Components/Lockscreen.qml:206
155+#: qml/Components/Lockscreen.qml:218
140156msgid "Emergency Call"
141157msgstr "Neatliekamās Palīdzības zvans"
142158
143−#: qml/Components/Lockscreen.qml:226
159+#: qml/Components/Lockscreen.qml:250
144160msgid "OK"
145161msgstr "LABI"
146162
147−#: qml/Components/PassphraseLockscreen.qml:61
148−#, qt-format
149−msgid "Hello %1"
150−msgstr "Sveiki, %1"
151−
152−#: qml/Components/PassphraseLockscreen.qml:61
153−msgid "Hello"
154−msgstr "Sveiki"
155−
156−#: qml/Dash/GenericScopeView.qml:361
163+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
157164msgid "See less"
158165msgstr "Redzēt mazāk"
159166
160−#: qml/Dash/GenericScopeView.qml:361
167+#: qml/Dash/GenericScopeView.qml:411
161168msgid "See all"
162169msgstr "Skatīt visus"
163170
164−#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
171+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
172+#: qml/Panel/SearchIndicator.qml:27
165173msgid "Search"
166174msgstr "Meklēt"
167175
168−#: qml/Dash/PageHeader.qml:270
176+#: qml/Dash/PageHeader.qml:268
169177msgid "Settings"
170−msgstr ""
178+msgstr "Iestatījumi"
171179
172−#: qml/Dash/PageHeader.qml:279
180+#: qml/Dash/PageHeader.qml:275
173181msgid "Remove from Favorites"
174−msgstr ""
182+msgstr "Izņemt no izlases"
175183
176−#: qml/Dash/PageHeader.qml:279
184+#: qml/Dash/PageHeader.qml:275
177185msgid "Add to Favorites"
178−msgstr ""
186+msgstr "Pievienot izlasei"
179187
180−#: qml/Dash/Previews/PreviewActionCombo.qml:34
188+#: qml/Dash/Previews/PreviewActionCombo.qml:35
181189msgid "More..."
182190msgstr "Vairāk..."
183191
184−#: qml/Dash/Previews/PreviewActionCombo.qml:34
192+#: qml/Dash/Previews/PreviewActionCombo.qml:35
185193msgid "Less..."
186194msgstr "Mazāk..."
187195
@@ -197,15 +205,23 @@ msgstr "Komentēt"
197205msgid "Send"
198206msgstr "Sūtīt"
199207
200−#: qml/Dash/ScopesOverview.qml:201
201−msgid "Manage Dash"
208+#: qml/Dash/PullToRefreshScopeStyle.qml:55
209+msgid "Pull to refresh…"
210+msgstr ""
211+
212+#: qml/Dash/PullToRefreshScopeStyle.qml:60
213+msgid "Release to refresh…"
214+msgstr ""
215+
216+#: qml/Dash/ScopesOverview.qml:206
217+msgid "Manage Scopes"
202218msgstr ""
203219
204−#: qml/Dash/ScopesOverview.qml:408
220+#: qml/Dash/ScopesOverview.qml:428
205221msgid "Done"
206222msgstr "Pabeigts"
207223
208−#: qml/Dash/ScopesOverview.qml:434
224+#: qml/Dash/ScopesOverview.qml:454
209225msgid "Store"
210226msgstr "Veikals"
211227
@@ -218,10 +234,10 @@ msgid "All"
218234msgstr "Visi"
219235
220236#: qml/Greeter/Greeter.qml:157
221−msgid "Swipe to unlock"
237+msgid "Unlock"
222238msgstr ""
223239
224−#: qml/Hud/HudParametrizedActionsPage.qml:132
240+#: qml/Hud/HudParametrizedActionsPage.qml:139
225241msgid "Confirm"
226242msgstr "Apstiprināt"
227243
@@ -241,15 +257,15 @@ msgstr "Runajiet Tagad"
241257msgid "Speaking..."
242258msgstr "Runa..."
243259
244−#: qml/Notifications/NotificationMenuItemFactory.qml:105
260+#: qml/Notifications/NotificationMenuItemFactory.qml:108
245261msgid "Show password"
246262msgstr "Rādīt paroli"
247263
248−#: qml/Notifications/NotificationMenuItemFactory.qml:120
264+#: qml/Notifications/NotificationMenuItemFactory.qml:124
249265msgid "Enter SIM PIN"
250−msgstr ""
266+msgstr "Ievadiet SIM PIN"
251267
252−#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
268+#: qml/Notifications/NotificationMenuItemFactory.qml:125
253269msgid "Sorry, incorrect PIN"
254270msgstr ""
255271
@@ -261,27 +277,31 @@ msgstr ""
261277msgid "Conference"
262278msgstr "Konference"
263279
264−#: qml/Panel/Indicators/MenuItemFactory.qml:651
280+#: qml/Panel/Indicators/MenuItemFactory.qml:600
281+msgid "Nothing is playing"
282+msgstr ""
283+
284+#: qml/Panel/Indicators/MenuItemFactory.qml:748
265285msgid "In queue…"
266286msgstr "Sarakstā..."
267287
268−#: qml/Panel/Indicators/MenuItemFactory.qml:655
288+#: qml/Panel/Indicators/MenuItemFactory.qml:752
269289msgid "Downloading"
270290msgstr "Lejupielādē"
271291
272−#: qml/Panel/Indicators/MenuItemFactory.qml:657
292+#: qml/Panel/Indicators/MenuItemFactory.qml:754
273293msgid "Paused, tap to resume"
274294msgstr ""
275295
276−#: qml/Panel/Indicators/MenuItemFactory.qml:659
296+#: qml/Panel/Indicators/MenuItemFactory.qml:756
277297msgid "Canceled"
278298msgstr "Atcelts"
279299
280−#: qml/Panel/Indicators/MenuItemFactory.qml:661
300+#: qml/Panel/Indicators/MenuItemFactory.qml:758
281301msgid "Finished"
282302msgstr "Pabeigts"
283303
284−#: qml/Panel/Indicators/MenuItemFactory.qml:663
304+#: qml/Panel/Indicators/MenuItemFactory.qml:760
285305msgid "Failed, tap to retry"
286306msgstr "Neizdevās, spiest lai mēģināt vēlreiz"
287307
@@ -293,58 +313,70 @@ msgstr "Atbloķēt SIM"
293313msgid "Roaming"
294314msgstr "Viesabonēšana"
295315
296−#: qml/Shell.qml:266
297−msgid "Enter your passphrase"
316+#: qml/Shell.qml:340
317+msgid "Enter passphrase"
298318msgstr ""
299319
300−#: qml/Shell.qml:267
320+#: qml/Shell.qml:341
301321msgid "Sorry, incorrect passphrase"
302322msgstr ""
303323
304−#: qml/Shell.qml:282
305−msgid "Enter your passcode"
324+#: qml/Shell.qml:342
325+msgid "Please re-enter"
326+msgstr ""
327+
328+#: qml/Shell.qml:344
329+msgid "Enter passcode"
306330msgstr ""
307331
308−#: qml/Shell.qml:283
332+#: qml/Shell.qml:345
309333msgid "Sorry, incorrect passcode"
310334msgstr ""
311335
312−#: qml/Shell.qml:273
336+#: qml/Shell.qml:348
313337#, qt-format
314−msgid "Enter your %1"
315−msgstr "Ievadiet jūsu %1"
338+msgid "Enter %1"
339+msgstr ""
316340
317−#: qml/Shell.qml:274
341+#: qml/Shell.qml:349
318342#, qt-format
319343msgid "Sorry, incorrect %1"
320344msgstr ""
321345
322−#: qml/Shell.qml:310
346+#: qml/Shell.qml:384
323347msgid "Sorry, incorrect passphrase."
324348msgstr ""
325349
326−#: qml/Shell.qml:311
350+#: qml/Shell.qml:385
327351msgid "Sorry, incorrect passcode."
328352msgstr ""
329353
330−#: qml/Shell.qml:312
354+#: qml/Shell.qml:386
331355msgid "This will be your last attempt."
332356msgstr "Šīs būs jūs pēdējais mēģinājums."
333357
334−#: qml/Shell.qml:314
358+#: qml/Shell.qml:388
335359msgid ""
336360"If passphrase is entered incorrectly, your phone will conduct a factory "
337361"reset and all personal data will be deleted."
338362msgstr ""
339363
340−#: qml/Shell.qml:315
364+#: qml/Shell.qml:389
341365msgid ""
342366"If passcode is entered incorrectly, your phone will conduct a factory reset "
343367"and all personal data will be deleted."
344368msgstr ""
345369
346−#~ msgid "Restart"
347−#~ msgstr "Pārstartēt"
370+#, qt-format
371+#~ msgid "Hello %1"
372+#~ msgstr "Sveiki, %1"
373+
374+#~ msgid "Hello"
375+#~ msgstr "Sveiki"
376+
377+#, qt-format
378+#~ msgid "Enter your %1"
379+#~ msgstr "Ievadiet jūsu %1"
348380
349−#~ msgid "Are you sure you would like to turn power off?"
350−#~ msgstr "Vai esat drošs ka vēlaties izslēgt?"
381+#~ msgid "Please wait"
382+#~ msgstr "Lūdzu, uzgaidiet"
po/ml.po+96−65
@@ -7,29 +7,49 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-26 18:24+0200\n"
10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
1111"PO-Revision-Date: 2013-11-23 11:44+0000\n"
1212"Last-Translator: ST Alfas <Unknown>\n"
1313"Language-Team: Malayalam <ml@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-28 06:30+0000\n"
18−"X-Generator: Launchpad (build 17174)\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"
19+"X-Generator: Launchpad (build 17196)\n"
1920
20−#: plugins/LightDM/Greeter.cpp:129
21+#: plugins/LightDM/Greeter.cpp:130
2122msgid "Password: "
2223msgstr ""
2324
24−#: plugins/Unity/Launcher/launcheritem.cpp:43
25−#: plugins/Unity/Launcher/launcheritem.cpp:73
25+#: plugins/Unity/Launcher/launcheritem.cpp:45
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
2627msgid "Pin shortcut"
2728msgstr ""
2829
29−#: plugins/Unity/Launcher/launcheritem.cpp:73
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
3031msgid "Unpin shortcut"
3132msgstr ""
3233
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
3353#: qml/Components/Dialogs.qml:70
3454msgid "Log out"
3555msgstr ""
@@ -74,11 +94,15 @@ msgid ""
7494"to power off?"
7595msgstr ""
7696
77−#: qml/Components/Dialogs.qml:144
97+#: qml/Components/Dialogs.qml:147
7898msgid "Power off"
7999msgstr ""
80100
81−#: qml/Components/Dialogs.qml:162
101+#: qml/Components/Dialogs.qml:157
102+msgid "Restart"
103+msgstr ""
104+
105+#: qml/Components/Dialogs.qml:167
82106msgid "Cancel"
83107msgstr ""
84108
@@ -130,60 +154,44 @@ msgid ""
130154"phone<br><br>Tap on the screen to start"
131155msgstr ""
132156
133−#: qml/Components/Lockscreen.qml:167
134−msgid "Please wait"
135−msgstr ""
136−
137−#: qml/Components/Lockscreen.qml:172
138−msgid "Too many incorrect attempts"
139−msgstr ""
140−
141−#: qml/Components/Lockscreen.qml:206
157+#: qml/Components/Lockscreen.qml:218
142158msgid "Emergency Call"
143159msgstr "അടിയന്തിര വിളി"
144160
145−#: qml/Components/Lockscreen.qml:226
161+#: qml/Components/Lockscreen.qml:250
146162msgid "OK"
147163msgstr ""
148164
149−#: qml/Components/PassphraseLockscreen.qml:61
150−#, qt-format
151−msgid "Hello %1"
152−msgstr "ഹലോ %1"
153−
154−#: qml/Components/PassphraseLockscreen.qml:61
155−msgid "Hello"
156−msgstr "ഹലോ"
157−
158−#: qml/Dash/GenericScopeView.qml:361
165+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
159166msgid "See less"
160167msgstr ""
161168
162−#: qml/Dash/GenericScopeView.qml:361
169+#: qml/Dash/GenericScopeView.qml:411
163170msgid "See all"
164171msgstr ""
165172
166−#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
173+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
174+#: qml/Panel/SearchIndicator.qml:27
167175msgid "Search"
168176msgstr "തിരയുക"
169177
170−#: qml/Dash/PageHeader.qml:270
178+#: qml/Dash/PageHeader.qml:268
171179msgid "Settings"
172180msgstr ""
173181
174−#: qml/Dash/PageHeader.qml:279
182+#: qml/Dash/PageHeader.qml:275
175183msgid "Remove from Favorites"
176184msgstr ""
177185
178−#: qml/Dash/PageHeader.qml:279
186+#: qml/Dash/PageHeader.qml:275
179187msgid "Add to Favorites"
180188msgstr ""
181189
182−#: qml/Dash/Previews/PreviewActionCombo.qml:34
190+#: qml/Dash/Previews/PreviewActionCombo.qml:35
183191msgid "More..."
184192msgstr ""
185193
186−#: qml/Dash/Previews/PreviewActionCombo.qml:34
194+#: qml/Dash/Previews/PreviewActionCombo.qml:35
187195msgid "Less..."
188196msgstr ""
189197
@@ -199,15 +207,23 @@ msgstr "ഒരു അവലോകനം ചേര്‍ക്കുക"
199207msgid "Send"
200208msgstr "അയയ്‌ക്കുക"
201209
202−#: qml/Dash/ScopesOverview.qml:201
203−msgid "Manage Dash"
210+#: qml/Dash/PullToRefreshScopeStyle.qml:55
211+msgid "Pull to refresh…"
212+msgstr ""
213+
214+#: qml/Dash/PullToRefreshScopeStyle.qml:60
215+msgid "Release to refresh…"
216+msgstr ""
217+
218+#: qml/Dash/ScopesOverview.qml:206
219+msgid "Manage Scopes"
204220msgstr ""
205221
206−#: qml/Dash/ScopesOverview.qml:408
222+#: qml/Dash/ScopesOverview.qml:428
207223msgid "Done"
208224msgstr ""
209225
210−#: qml/Dash/ScopesOverview.qml:434
226+#: qml/Dash/ScopesOverview.qml:454
211227msgid "Store"
212228msgstr ""
213229
@@ -220,10 +236,10 @@ msgid "All"
220236msgstr ""
221237
222238#: qml/Greeter/Greeter.qml:157
223−msgid "Swipe to unlock"
239+msgid "Unlock"
224240msgstr ""
225241
226−#: qml/Hud/HudParametrizedActionsPage.qml:132
242+#: qml/Hud/HudParametrizedActionsPage.qml:139
227243msgid "Confirm"
228244msgstr "സ്ഥിരീകരിക്കുക"
229245
@@ -243,15 +259,15 @@ msgstr "ഇപ്പോള്‍ സംസാരിക്കുക..."
243259msgid "Speaking..."
244260msgstr "സംസാരിക്കുന്നു..."
245261
246−#: qml/Notifications/NotificationMenuItemFactory.qml:105
262+#: qml/Notifications/NotificationMenuItemFactory.qml:108
247263msgid "Show password"
248264msgstr "രഹസ്യവാക്ക് കാണിക്കുക"
249265
250−#: qml/Notifications/NotificationMenuItemFactory.qml:120
266+#: qml/Notifications/NotificationMenuItemFactory.qml:124
251267msgid "Enter SIM PIN"
252268msgstr ""
253269
254−#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
270+#: qml/Notifications/NotificationMenuItemFactory.qml:125
255271msgid "Sorry, incorrect PIN"
256272msgstr ""
257273
@@ -263,27 +279,31 @@ msgstr ""
263279msgid "Conference"
264280msgstr ""
265281
266−#: qml/Panel/Indicators/MenuItemFactory.qml:651
282+#: qml/Panel/Indicators/MenuItemFactory.qml:600
283+msgid "Nothing is playing"
284+msgstr ""
285+
286+#: qml/Panel/Indicators/MenuItemFactory.qml:748
267287msgid "In queue…"
268288msgstr ""
269289
270−#: qml/Panel/Indicators/MenuItemFactory.qml:655
290+#: qml/Panel/Indicators/MenuItemFactory.qml:752
271291msgid "Downloading"
272292msgstr ""
273293
274−#: qml/Panel/Indicators/MenuItemFactory.qml:657
294+#: qml/Panel/Indicators/MenuItemFactory.qml:754
275295msgid "Paused, tap to resume"
276296msgstr ""
277297
278−#: qml/Panel/Indicators/MenuItemFactory.qml:659
298+#: qml/Panel/Indicators/MenuItemFactory.qml:756
279299msgid "Canceled"
280300msgstr ""
281301
282−#: qml/Panel/Indicators/MenuItemFactory.qml:661
302+#: qml/Panel/Indicators/MenuItemFactory.qml:758
283303msgid "Finished"
284304msgstr ""
285305
286−#: qml/Panel/Indicators/MenuItemFactory.qml:663
306+#: qml/Panel/Indicators/MenuItemFactory.qml:760
287307msgid "Failed, tap to retry"
288308msgstr ""
289309
@@ -295,52 +315,63 @@ msgstr ""
295315msgid "Roaming"
296316msgstr ""
297317
298−#: qml/Shell.qml:266
299−msgid "Enter your passphrase"
318+#: qml/Shell.qml:340
319+msgid "Enter passphrase"
300320msgstr ""
301321
302−#: qml/Shell.qml:267
322+#: qml/Shell.qml:341
303323msgid "Sorry, incorrect passphrase"
304324msgstr ""
305325
306−#: qml/Shell.qml:282
307−msgid "Enter your passcode"
326+#: qml/Shell.qml:342
327+msgid "Please re-enter"
328+msgstr ""
329+
330+#: qml/Shell.qml:344
331+msgid "Enter passcode"
308332msgstr ""
309333
310−#: qml/Shell.qml:283
334+#: qml/Shell.qml:345
311335msgid "Sorry, incorrect passcode"
312336msgstr ""
313337
314−#: qml/Shell.qml:273
338+#: qml/Shell.qml:348
315339#, qt-format
316−msgid "Enter your %1"
340+msgid "Enter %1"
317341msgstr ""
318342
319−#: qml/Shell.qml:274
343+#: qml/Shell.qml:349
320344#, qt-format
321345msgid "Sorry, incorrect %1"
322346msgstr ""
323347
324−#: qml/Shell.qml:310
348+#: qml/Shell.qml:384
325349msgid "Sorry, incorrect passphrase."
326350msgstr ""
327351
328−#: qml/Shell.qml:311
352+#: qml/Shell.qml:385
329353msgid "Sorry, incorrect passcode."
330354msgstr ""
331355
332−#: qml/Shell.qml:312
356+#: qml/Shell.qml:386
333357msgid "This will be your last attempt."
334358msgstr ""
335359
336−#: qml/Shell.qml:314
360+#: qml/Shell.qml:388
337361msgid ""
338362"If passphrase is entered incorrectly, your phone will conduct a factory "
339363"reset and all personal data will be deleted."
340364msgstr ""
341365
342−#: qml/Shell.qml:315
366+#: qml/Shell.qml:389
343367msgid ""
344368"If passcode is entered incorrectly, your phone will conduct a factory reset "
345369"and all personal data will be deleted."
346370msgstr ""
371+
372+#, qt-format
373+#~ msgid "Hello %1"
374+#~ msgstr "ഹലോ %1"
375+
376+#~ msgid "Hello"
377+#~ msgstr "ഹലോ"
po/mr.po+89−65
@@ -7,29 +7,49 @@ msgid ""
77msgstr ""
88"Project-Id-Version: unity8\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-26 18:24+0200\n"
10+"POT-Creation-Date: 2014-10-03 08:13-0400\n"
1111"PO-Revision-Date: 2014-01-14 19:54+0000\n"
1212"Last-Translator: Rohan Deshmukh <Unknown>\n"
1313"Language-Team: Marathi <mr@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-08-28 06:30+0000\n"
18−"X-Generator: Launchpad (build 17174)\n"
17+"Plural-Forms: nplurals=2; plural=n != 1;\n"
18+"X-Launchpad-Export-Date: 2014-10-07 06:59+0000\n"
19+"X-Generator: Launchpad (build 17196)\n"
1920
20−#: plugins/LightDM/Greeter.cpp:129
21+#: plugins/LightDM/Greeter.cpp:130
2122msgid "Password: "
2223msgstr ""
2324
24−#: plugins/Unity/Launcher/launcheritem.cpp:43
25−#: plugins/Unity/Launcher/launcheritem.cpp:73
25+#: plugins/Unity/Launcher/launcheritem.cpp:45
26+#: plugins/Unity/Launcher/launcheritem.cpp:91
2627msgid "Pin shortcut"
2728msgstr ""
2829
29−#: plugins/Unity/Launcher/launcheritem.cpp:73
30+#: plugins/Unity/Launcher/launcheritem.cpp:91
3031msgid "Unpin shortcut"
3132msgstr ""
3233
34+#: qml/Components/DelayedLockscreen.qml:47
35+msgid "Device Locked"
36+msgstr ""
37+
38+#: qml/Components/DelayedLockscreen.qml:62
39+msgid "You have been locked out due to too many failed passphrase attempts."
40+msgstr ""
41+
42+#: qml/Components/DelayedLockscreen.qml:63
43+msgid "You have been locked out due to too many failed passcode attempts."
44+msgstr ""
45+
46+#: qml/Components/DelayedLockscreen.qml:72
47+#, qt-format
48+msgid "Please wait %1 minute and then try again…"
49+msgid_plural "Please wait %1 minutes and then try again…"
50+msgstr[0] ""
51+msgstr[1] ""
52+
3353#: qml/Components/Dialogs.qml:70
3454msgid "Log out"
3555msgstr ""
@@ -74,11 +94,15 @@ msgid ""
7494"to power off?"
7595msgstr ""
7696
77−#: qml/Components/Dialogs.qml:144
97+#: qml/Components/Dialogs.qml:147
7898msgid "Power off"
7999msgstr ""
80100
81−#: qml/Components/Dialogs.qml:162
101+#: qml/Components/Dialogs.qml:157
102+msgid "Restart"
103+msgstr ""
104+
105+#: qml/Components/Dialogs.qml:167
82106msgid "Cancel"
83107msgstr ""
84108
@@ -128,60 +152,44 @@ msgid ""
128152"phone<br><br>Tap on the screen to start"
129153msgstr ""
130154
131−#: qml/Components/Lockscreen.qml:167
132−msgid "Please wait"
133−msgstr ""
134−
135−#: qml/Components/Lockscreen.qml:172
136−msgid "Too many incorrect attempts"
137−msgstr ""
138−
139−#: qml/Components/Lockscreen.qml:206
155+#: qml/Components/Lockscreen.qml:218
140156msgid "Emergency Call"
141157msgstr ""
142158
143−#: qml/Components/Lockscreen.qml:226
159+#: qml/Components/Lockscreen.qml:250
144160msgid "OK"
145161msgstr ""
146162
147−#: qml/Components/PassphraseLockscreen.qml:61
148−#, qt-format
149−msgid "Hello %1"
150−msgstr ""
151−
152−#: qml/Components/PassphraseLockscreen.qml:61
153−msgid "Hello"
154−msgstr ""
155−
156−#: qml/Dash/GenericScopeView.qml:361
163+#: qml/Dash/GenericScopeView.qml:411 qml/Dash/GenericScopeView.qml:568
157164msgid "See less"
158165msgstr ""
159166
160−#: qml/Dash/GenericScopeView.qml:361
167+#: qml/Dash/GenericScopeView.qml:411
161168msgid "See all"
162169msgstr ""
163170
164−#: qml/Dash/GenericScopeView.qml:424 qml/Panel/SearchIndicator.qml:27
171+#: qml/Dash/GenericScopeView.qml:473 qml/Dash/PageHeader.qml:258
172+#: qml/Panel/SearchIndicator.qml:27
165173msgid "Search"
166174msgstr ""
167175
168−#: qml/Dash/PageHeader.qml:270
176+#: qml/Dash/PageHeader.qml:268
169177msgid "Settings"
170178msgstr ""
171179
172−#: qml/Dash/PageHeader.qml:279
180+#: qml/Dash/PageHeader.qml:275
173181msgid "Remove from Favorites"
174182msgstr ""
175183
176−#: qml/Dash/PageHeader.qml:279
184+#: qml/Dash/PageHeader.qml:275
177185msgid "Add to Favorites"
178186msgstr ""
179187
180−#: qml/Dash/Previews/PreviewActionCombo.qml:34
188+#: qml/Dash/Previews/PreviewActionCombo.qml:35
181189msgid "More..."
182190msgstr ""
183191
184−#: qml/Dash/Previews/PreviewActionCombo.qml:34
192+#: qml/Dash/Previews/PreviewActionCombo.qml:35
185193msgid "Less..."
186194msgstr ""
187195
@@ -197,15 +205,23 @@ msgstr ""
197205msgid "Send"
198206msgstr ""
199207
200−#: qml/Dash/ScopesOverview.qml:201
201−msgid "Manage Dash"
208+#: qml/Dash/PullToRefreshScopeStyle.qml:55
209+msgid "Pull to refresh…"
210+msgstr ""
211+
212+#: qml/Dash/PullToRefreshScopeStyle.qml:60
213+msgid "Release to refresh…"
214+msgstr ""
215+
216+#: qml/Dash/ScopesOverview.qml:206
217+msgid "Manage Scopes"
202218msgstr ""
203219
204−#: qml/Dash/ScopesOverview.qml:408
220+#: qml/Dash/ScopesOverview.qml:428
205221msgid "Done"
206222msgstr ""
207223
208−#: qml/Dash/ScopesOverview.qml:434
224+#: qml/Dash/ScopesOverview.qml:454
209225msgid "Store"
210226msgstr ""
211227
@@ -218,10 +234,10 @@ msgid "All"
218234msgstr ""
219235
220236#: qml/Greeter/Greeter.qml:157
221−msgid "Swipe to unlock"
237+msgid "Unlock"
222238msgstr ""
223239
224−#: qml/Hud/HudParametrizedActionsPage.qml:132
240+#: qml/Hud/HudParametrizedActionsPage.qml:139
225241msgid "Confirm"
226242msgstr ""
227243
@@ -241,15 +257,15 @@ msgstr ""
241257msgid "Speaking..."
242258msgstr ""
243259
244−#: qml/Notifications/NotificationMenuItemFactory.qml:105
260+#: qml/Notifications/NotificationMenuItemFactory.qml:108
245261msgid "Show password"
246262msgstr ""
247263
248−#: qml/Notifications/NotificationMenuItemFactory.qml:120
264+#: qml/Notifications/NotificationMenuItemFactory.qml:124
249265msgid "Enter SIM PIN"
250266msgstr ""
251267
252−#: qml/Notifications/NotificationMenuItemFactory.qml:121 qml/Shell.qml:270
268+#: qml/Notifications/NotificationMenuItemFactory.qml:125
253269msgid "Sorry, incorrect PIN"
254270msgstr ""
255271
@@ -261,27 +277,31 @@ msgstr ""
261277msgid "Conference"
262278msgstr ""
263279
264−#: qml/Panel/Indicators/MenuItemFactory.qml:651
280+#: qml/Panel/Indicators/MenuItemFactory.qml:600
281+msgid "Nothing is playing"
282+msgstr ""
283+
284+#: qml/Panel/Indicators/MenuItemFactory.qml:748
265285msgid "In queue…"
266286msgstr ""
267287
268−#: qml/Panel/Indicators/MenuItemFactory.qml:655
288+#: qml/Panel/Indicators/MenuItemFactory.qml:752
269289msgid "Downloading"
270290msgstr ""
271291
272−#: qml/Panel/Indicators/MenuItemFactory.qml:657
292+#: qml/Panel/Indicators/MenuItemFactory.qml:754
273293msgid "Paused, tap to resume"
274294msgstr ""
275295
276−#: qml/Panel/Indicators/MenuItemFactory.qml:659
296+#: qml/Panel/Indicators/MenuItemFactory.qml:756
277297msgid "Canceled"
278298msgstr ""
279299
280−#: qml/Panel/Indicators/MenuItemFactory.qml:661
300+#: qml/Panel/Indicators/MenuItemFactory.qml:758
281301msgid "Finished"
282302msgstr ""
283303
284−#: qml/Panel/Indicators/MenuItemFactory.qml:663
304+#: qml/Panel/Indicators/MenuItemFactory.qml:760
285305msgid "Failed, tap to retry"
286306msgstr ""
287307
@@ -293,51 +313,55 @@ msgstr ""
293313msgid "Roaming"
294314msgstr ""
295315
296−#: qml/Shell.qml:266
297−msgid "Enter your passphrase"
316+#: qml/Shell.qml:340
317+msgid "Enter passphrase"
298318msgstr ""
299319
300−#: qml/Shell.qml:267
320+#: qml/Shell.qml:341
301321msgid "Sorry, incorrect passphrase"
302322msgstr ""
303323
304−#: qml/Shell.qml:282
305−msgid "Enter your passcode"
324+#: qml/Shell.qml:342
325+msgid "Please re-enter"
326+msgstr ""
327+
328+#: qml/Shell.qml:344
329+msgid "Enter passcode"
306330msgstr ""
307331
308−#: qml/Shell.qml:283
332+#: qml/Shell.qml:345
309333msgid "Sorry, incorrect passcode"
310334msgstr ""
311335
312−#: qml/Shell.qml:273
336+#: qml/Shell.qml:348
313337#, qt-format
314−msgid "Enter your %1"
338+msgid "Enter %1"
315339msgstr ""
316340
317−#: qml/Shell.qml:274
341+#: qml/Shell.qml:349
318342#, qt-format
319343msgid "Sorry, incorrect %1"
320344msgstr ""
321345
322−#: qml/Shell.qml:310
346+#: qml/Shell.qml:384
323347msgid "Sorry, incorrect passphrase."
324348msgstr ""
325349
326−#: qml/Shell.qml:311
350+#: qml/Shell.qml:385
327351msgid "Sorry, incorrect passcode."
328352msgstr ""
329353
330−#: qml/Shell.qml:312
354+#: qml/Shell.qml:386
331355msgid "This will be your last attempt."
332356msgstr ""
333357
334−#: qml/Shell.qml:314
358+#: qml/Shell.qml:388
335359msgid ""
336360"If passphrase is entered incorrectly, your phone will conduct a factory "
337361"reset and all personal data will be deleted."
338362msgstr ""
339363
340−#: qml/Shell.qml:315
364+#: qml/Shell.qml:389
341365msgid ""
342366"If passcode is entered incorrectly, your phone will conduct a factory reset "
343367"and all personal data will be deleted."
po/ms.po+96−65

This diff is too big to show here.

po/my.po+96−65

This diff is too big to show here.

po/nb.po+136−91

This diff is too big to show here.

po/nl.po+139−92

This diff is too big to show here.

po/pl.po+101−66

This diff is too big to show here.

po/pt.po+133−90

This diff is too big to show here.

po/pt_BR.po+118−77

This diff is too big to show here.

po/ro.po+143−92

This diff is too big to show here.

po/ru.po+131−89

This diff is too big to show here.

po/shn.po+89−65

This diff is too big to show here.

po/si.po+89−65

This diff is too big to show here.

po/sl.po+136−90

This diff is too big to show here.

po/sq.po+89−65

This diff is too big to show here.

po/sr.po+181−122

This diff is too big to show here.

po/sv.po+147−94

This diff is too big to show here.

po/sw.po+89−65

This diff is too big to show here.

po/ta.po+96−65

This diff is too big to show here.

po/te.po+100−66

This diff is too big to show here.

po/th.po+253−105

This diff is too big to show here.

po/tr.po+131−84

This diff is too big to show here.

po/ug.po+155−100

This diff is too big to show here.

po/uk.po+139−90

This diff is too big to show here.

po/unity8.pot+82−59

This diff is too big to show here.

po/vi.po+89−65

This diff is too big to show here.

po/xh.po+89−65

This diff is too big to show here.

po/zh_CN.po+99−71

This diff is too big to show here.

po/zh_HK.po+100−66

This diff is too big to show here.

po/zh_TW.po+147−98

This diff is too big to show here.

qml/Components/Background.qml+1−1

This diff is too big to show here.

qml/Components/DelayedLockscreen.qmlnew file+92

This diff is too big to show here.

qml/Components/Dialogs.qml+10

This diff is too big to show here.

qml/Stages/Dot.qml → qml/Components/Header.qmlrenamed+9−7

This diff is too big to show here.

qml/Components/LazyImage.qml+1

This diff is too big to show here.

qml/Components/Lockscreen.qml+126−102

This diff is too big to show here.

qml/Components/PassphraseLockscreen.qml+96−43

This diff is too big to show here.

qml/Components/PinLockscreen.qml+10−5

This diff is too big to show here.

qml/Components/ResponsiveGridView.qml+5−1

This diff is too big to show here.

qml/Dash/CardCarousel.qml+1−1

This diff is too big to show here.

qml/Dash/CardGrid.qml+3−2

This diff is too big to show here.

qml/Dash/CardHorizontalList.qml+2−2

This diff is too big to show here.

qml/Dash/CardTool.qml+20−15

This diff is too big to show here.

qml/Dash/CardVerticalJournal.qml+3−2

This diff is too big to show here.

qml/Dash/Dash.qml+13−1

This diff is too big to show here.

qml/Dash/DashApplication.qml+2−8

This diff is too big to show here.

qml/Dash/DashContent.qml+3

This diff is too big to show here.

qml/Dash/DashNavigation.qml+3−3

This diff is too big to show here.

qml/Dash/DashRenderer.qml+7−2

This diff is too big to show here.

qml/Dash/GenericScopeView.qml+157−50

This diff is too big to show here.

qml/Dash/PageHeader.qml+23−17

This diff is too big to show here.

qml/Dash/PreviewListView.qml+2−2

This diff is too big to show here.

qml/Dash/Previews/PreviewHeader.qml+13−1

This diff is too big to show here.

qml/Dash/Previews/PreviewImageGallery.qml+121−18

This diff is too big to show here.

qml/Dash/Previews/PreviewPayments.qml+8

This diff is too big to show here.

qml/Dash/PullToRefreshScopeStyle.qmlnew file+82

This diff is too big to show here.

qml/Dash/ScopeListView.qml+1

This diff is too big to show here.

qml/Dash/ScopeSettingsPage.qml+1

This diff is too big to show here.

qml/Dash/ScopesOverview.qml+7−1

This diff is too big to show here.

qml/Dash/ScopesOverviewAll.qml+2

This diff is too big to show here.

qml/Dash/ScopesOverviewFavorites.qml+1−1

This diff is too big to show here.

qml/Dash/graphics/checkers.pngdeleted

Binary file not shown.

qml/Dash/graphics/pixel.pngnew file

Binary file not shown.

qml/Greeter/Greeter.qml+1−1

This diff is too big to show here.

qml/Greeter/GreeterContent.qml+3

This diff is too big to show here.

qml/Launcher/Launcher.qml+2−2

This diff is too big to show here.

qml/Launcher/LauncherDelegate.qml+4−2

This diff is too big to show here.

qml/Launcher/LauncherPanel.qml+1

This diff is too big to show here.

qml/Notifications/Notification.qml+133−47

This diff is too big to show here.

qml/Notifications/NotificationMenuItemFactory.qml+4

This diff is too big to show here.

qml/Notifications/Notifications.qml+1−1

This diff is too big to show here.

qml/Panel/ActiveCallHint.qml+1−1

This diff is too big to show here.

qml/Panel/IndicatorItem.qml+6

This diff is too big to show here.

qml/Panel/Indicators.qml+2−13

This diff is too big to show here.

qml/Panel/Indicators/DefaultIndicatorPage.qml+8−49

This diff is too big to show here.

qml/Panel/Indicators/IndicatorBase.qml+1

This diff is too big to show here.

qml/Panel/Indicators/IndicatorDelegate.qml+2−10

This diff is too big to show here.

qml/Panel/Indicators/IndicatorsLight.qml+4−7

This diff is too big to show here.

qml/Panel/Indicators/MenuItemFactory.qml+159−48

This diff is too big to show here.

qml/Panel/Indicators/MessageMenuItemFactory.qml+156−171

This diff is too big to show here.

qml/Panel/Indicators/RemoveBackground.qmldeleted−55

This diff is too big to show here.

qml/Panel/Indicators/VisibleIndicators.qml+1

This diff is too big to show here.

qml/Panel/Indicators/client/IndicatorsClient.qml+4

This diff is too big to show here.

qml/Panel/MenuContent.qml+94−112

This diff is too big to show here.

qml/Shell.qml+101−36

This diff is too big to show here.

qml/Stages/Animations/BaseSurfaceAnimation.qml → qml/Stages/Animations/BaseSessionAnimation.qmlrenamed+23−20

This diff is too big to show here.

qml/Stages/Animations/DarkenAndFadeInAnimation.qmldeleted−48

This diff is too big to show here.

qml/Stages/Animations/SwipeFromBottomAnimation.qml+24−19

This diff is too big to show here.

qml/Stages/Animations/SwipeUpAnimation.qmldeleted−49

This diff is too big to show here.

qml/Stages/ApplicationWindow.qml+69−72

This diff is too big to show here.

qml/Stages/MainViewStyle.qmlnew file+79

This diff is too big to show here.

qml/Stages/PageHeadStyle.qmlnew file+76

This diff is too big to show here.

qml/Stages/PhoneStage.qml+17−3

This diff is too big to show here.

qml/Stages/SessionContainer.qmlnew file+150

This diff is too big to show here.

qml/Stages/Splash.qml+107−13

This diff is too big to show here.

qml/Stages/SpreadDelegate.qml+3

This diff is too big to show here.

qml/Stages/SurfaceContainer.qml+26−66

This diff is too big to show here.

qml/Stages/TabletStage.qml+13

This diff is too big to show here.

qml/Stages/TransformedTabletSpreadDelegate.qml+2−1

This diff is too big to show here.

qml/Stages/WaitingDots.qmldeleted−76

This diff is too big to show here.

qml/Stages/graphics/PageHeaderBaseDividerBottom@18.pngnew file

Binary file not shown.

qml/Stages/graphics/PageHeaderBaseDividerLight@18.pngnew file

Binary file not shown.

qml/Stages/graphics/PageHeaderBaseDividerLight@18.scinew file+5

This diff is too big to show here.

qml/Stages/graphics/background_paper@27.pngnew file

Binary file not shown.

run_on_device.sh+43−41

This diff is too big to show here.

src/CMakeLists.txt+1

This diff is too big to show here.

src/Dash/CMakeLists.txt+3

This diff is too big to show here.

src/Dash/main.cpp+17−2

This diff is too big to show here.

src/Panel/CMakeLists.txt+2

This diff is too big to show here.

src/libunity8-private/CMakeLists.txtnew file+25

This diff is too big to show here.

src/libunity8-private/abstractdbusservicemonitor.cppnew file+87

This diff is too big to show here.

src/libunity8-private/abstractdbusservicemonitor.hnew file+66

This diff is too big to show here.

src/main.cpp+1

This diff is too big to show here.

tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py+4−2

This diff is too big to show here.

tests/autopilot/unity8/indicators/tests/test_indicators.py+1−1

This diff is too big to show here.

tests/autopilot/unity8/process_helpers.py+12−17

This diff is too big to show here.

tests/autopilot/unity8/shell/emulators/dash.py+4−4

This diff is too big to show here.

tests/autopilot/unity8/shell/emulators/greeter.py+4−1

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/__init__.py+4−21

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/test_lock_screen.py+11−10

This diff is too big to show here.

tests/autopilot/unity8/shell/tests/test_notifications.py+61−97

This diff is too big to show here.

tests/mocks/AccountsService/AccountsService.cpp+24

This diff is too big to show here.

tests/mocks/AccountsService/AccountsService.h+16

This diff is too big to show here.

tests/mocks/AccountsService/AccountsService.qmltypes+1

This diff is too big to show here.

tests/mocks/HudClient/fake_libhud_client.cpp+8−1

This diff is too big to show here.

tests/mocks/LightDM/LightDM.qmltypes+2

This diff is too big to show here.

tests/mocks/Powerd/Powerd.cpp+15−1

This diff is too big to show here.

tests/mocks/Powerd/Powerd.h+8−1

This diff is too big to show here.

tests/mocks/Powerd/Powerd.qmltypes+3−3

This diff is too big to show here.

tests/mocks/QtMultimedia/audio.cpp+1−1

This diff is too big to show here.

tests/mocks/Ubuntu/CMakeLists.txt+1

This diff is too big to show here.

tests/mocks/Ubuntu/Connectivity/CMakeLists.txtnew file+10

This diff is too big to show here.

tests/mocks/Ubuntu/Connectivity/networking-status.cppnew file+64

This diff is too big to show here.

tests/mocks/Ubuntu/Connectivity/networking-status.hnew file+73

This diff is too big to show here.

tests/mocks/Ubuntu/Connectivity/plugin.cppnew file+46

This diff is too big to show here.

tests/mocks/Ubuntu/Connectivity/plugin.hnew file+35

This diff is too big to show here.

tests/mocks/Ubuntu/Connectivity/qmldirnew file+2

This diff is too big to show here.

tests/mocks/Ubuntu/Payments/MockPayments.cpp+12−7

This diff is too big to show here.

tests/mocks/Ubuntu/Payments/MockPayments.h+2

This diff is too big to show here.

tests/mocks/Ubuntu/SystemImage/SystemImage.qmltypes+3−1

This diff is too big to show here.

tests/mocks/Ubuntu/Telephony/MockCallEntry.cpp+26−1

This diff is too big to show here.

tests/mocks/Ubuntu/Telephony/MockCallEntry.h+9−1

This diff is too big to show here.

tests/mocks/Unity/Application/Application.qmltypes+115−70

This diff is too big to show here.

tests/mocks/Unity/Application/ApplicationDBusAdaptor.cppdeleted−81

This diff is too big to show here.

tests/mocks/Unity/Application/ApplicationInfo.cpp+36−85

This diff is too big to show here.

tests/mocks/Unity/Application/ApplicationInfo.h+18−23

This diff is too big to show here.

tests/mocks/Unity/Application/ApplicationManager.cpp+35−16

This diff is too big to show here.

tests/mocks/Unity/Application/ApplicationManager.h+7−4

This diff is too big to show here.

tests/mocks/Unity/Application/ApplicationTestInterface.cppnew file+117

This diff is too big to show here.

tests/mocks/Unity/Application/ApplicationDBusAdaptor.h → tests/mocks/Unity/Application/ApplicationTestInterface.hrenamed+13−11

This diff is too big to show here.

tests/mocks/Unity/Application/CMakeLists.txt+7−2

This diff is too big to show here.

tests/mocks/Unity/Application/MirSurfaceItem.cpp+27−73

This diff is too big to show here.

tests/mocks/Unity/Application/MirSurfaceItem.h+31−31

This diff is too big to show here.

tests/mocks/Unity/Application/MirSurfaceItem.qml+12−2

This diff is too big to show here.

tests/mocks/Unity/Application/MirSurfaceItemModel.hnew file+35

This diff is too big to show here.

tests/mocks/Unity/Application/ObjectListModel.hnew file+106

This diff is too big to show here.

tests/mocks/Unity/Application/Session.cppnew file+174

This diff is too big to show here.

tests/mocks/Unity/Application/Session.hnew file+90

This diff is too big to show here.

tests/mocks/Unity/Application/SessionManager.cppnew file+55

This diff is too big to show here.

tests/mocks/Unity/Application/SessionManager.hnew file+44

This diff is too big to show here.

tests/mocks/Unity/Application/SessionModel.hnew file+35

This diff is too big to show here.

tests/mocks/Unity/Application/SurfaceManager.cpp+20−7

This diff is too big to show here.

tests/mocks/Unity/Application/SurfaceManager.h+6−2

This diff is too big to show here.

tests/mocks/Unity/Application/plugin.cpp+37−4

This diff is too big to show here.

tests/mocks/Unity/DashCommunicator/dashcommunicatorservice.cpp+2−2

This diff is too big to show here.

tests/mocks/Unity/DashCommunicator/dashcommunicatorservice.h+2−2

This diff is too big to show here.

tests/mocks/Unity/Indicators/FakeMenuPage.qml−10

This diff is too big to show here.

tests/mocks/Unity/Indicators/Indicators.qmltypes+20

This diff is too big to show here.

tests/mocks/Unity/Launcher/CMakeLists.txt+1−1

This diff is too big to show here.

tests/mocks/Unity/Launcher/MockLauncherItem.cpp+14

This diff is too big to show here.

tests/mocks/Unity/Launcher/MockLauncherItem.h+18−17

This diff is too big to show here.

tests/mocks/Unity/Launcher/MockLauncherModel.cpp+10

This diff is too big to show here.

tests/mocks/Unity/Unity.qmltypes+30−2

This diff is too big to show here.

tests/mocks/Unity/fake_categories.cpp+95−136

This diff is too big to show here.

tests/mocks/Unity/fake_categories.h+7−12

This diff is too big to show here.

tests/mocks/Unity/fake_resultsmodel.cpp+9

This diff is too big to show here.

tests/mocks/Unity/fake_resultsmodel.h+3

This diff is too big to show here.

tests/mocks/Unity/fake_scope.cpp+28−6

This diff is too big to show here.

tests/mocks/Unity/fake_scope.h+8−1

This diff is too big to show here.

tests/mocks/Unity/fake_scopes.cpp+1

This diff is too big to show here.

tests/plugins/Dash/CMakeLists.txt+3−3

This diff is too big to show here.

tests/plugins/Dash/cardcreator/1.res+9−8

This diff is too big to show here.

tests/plugins/Dash/cardcreator/2.res+10−13

This diff is too big to show here.

tests/plugins/Dash/cardcreator/3.res+12−12

This diff is too big to show here.

tests/plugins/Dash/cardcreator/4.res+8−11

This diff is too big to show here.

tests/plugins/Dash/cardcreator/5.res+14−14

This diff is too big to show here.

tests/plugins/Dash/cardcreator/6.res+8−10

This diff is too big to show here.

tests/plugins/Dash/cardcreator/7.res+12−15

This diff is too big to show here.

tests/plugins/Dash/listviewwithpageheadertest.cpp+39

This diff is too big to show here.

tests/plugins/Dash/listviewwithpageheadertest.qml+1

This diff is too big to show here.

tests/plugins/Dash/listviewwithpageheadertestsection.qml+1

This diff is too big to show here.

tests/plugins/Dash/listviewwithpageheadertestsectionexternalmodel.qml+1

This diff is too big to show here.

tests/plugins/Ubuntu/Gestures/CMakeLists.txt+1−1

This diff is too big to show here.

tests/plugins/Unity/Launcher/CMakeLists.txt+10−25

This diff is too big to show here.

tests/plugins/Unity/Launcher/gsettings.cppnew file+40

This diff is too big to show here.

tests/plugins/Unity/Launcher/gsettings.hnew file+38

This diff is too big to show here.

tests/plugins/Unity/Launcher/launcherbackendtest.cppdeleted−239

This diff is too big to show here.

tests/plugins/Unity/Launcher/launchermodeltest.cpp+89−2

This diff is too big to show here.

tests/plugins/Utils/CMakeLists.txt+2−3

This diff is too big to show here.

tests/plugins/Utils/timeformattertest.cpp+104−7

This diff is too big to show here.

tests/qmltests/CMakeLists.txt+3−1

This diff is too big to show here.

tests/qmltests/Components/CMakeLists.txt+1−1

This diff is too big to show here.

tests/qmltests/Components/tst_DragHandle/HorizontalShowable.qml+1−1

This diff is too big to show here.

tests/qmltests/Components/tst_DragHandle/VerticalShowable.qml+1−1

This diff is too big to show here.

tests/qmltests/Greeter/tst_Lockscreen.qml → tests/qmltests/Components/tst_Lockscreen.qmlrenamed+31−51

This diff is too big to show here.

tests/qmltests/Dash/CardHelpers.js+1−12

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewHeader.qml+4−2

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewImageGallery.qml+51−1

This diff is too big to show here.

tests/qmltests/Dash/Previews/tst_PreviewPayments.qml+88−9

This diff is too big to show here.

tests/qmltests/Dash/tst_Card.qml+29−3

This diff is too big to show here.

tests/qmltests/Dash/tst_CardTool.qml+28−20

This diff is too big to show here.

tests/qmltests/Dash/tst_Dash.qml+25−41

This diff is too big to show here.

tests/qmltests/Dash/tst_DashContent.qml+14−1

This diff is too big to show here.

tests/qmltests/Dash/tst_GenericScopeView.qml+157−7

This diff is too big to show here.

tests/qmltests/Dash/tst_PreviewListView.qml+29−1

This diff is too big to show here.

tests/qmltests/Launcher/tst_Launcher.qml+3−1

This diff is too big to show here.

tests/qmltests/Notifications/tst_Notifications.qml+60−18

This diff is too big to show here.

tests/qmltests/Panel/Indicators/tst_DefaultIndicatorPage.qml+3−23

This diff is too big to show here.

tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml+32−16

This diff is too big to show here.

tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml+43−53

This diff is too big to show here.

tests/qmltests/Panel/tst_ActiveCallHint.qml+20−7

This diff is too big to show here.

tests/qmltests/Panel/tst_Indicators.qml+10−10

This diff is too big to show here.

tests/qmltests/Panel/tst_MenuContent.qml+14−56

This diff is too big to show here.

tests/qmltests/Stages/RecursingChildSessionControl.qmlnew file+142

This diff is too big to show here.

tests/qmltests/Stages/tst_ApplicationWindow.qml+113−43

This diff is too big to show here.

tests/qmltests/Stages/tst_PhoneStage.qml+59−1

This diff is too big to show here.

tests/qmltests/Stages/tst_SessionContainer.qmlnew file+330

This diff is too big to show here.

tests/qmltests/Stages/tst_Splash.qmlnew file+117

This diff is too big to show here.

tests/qmltests/Stages/tst_SurfaceContainer.qml+28−43

This diff is too big to show here.

tests/qmltests/Components/tst_DragHandle/UnityLogo.png → tests/qmltests/UnityLogo.pngrenamed

Binary file not shown.

tests/qmltests/tst_Shell.qml+151−45

This diff is too big to show here.

tests/qmltests/tst_ShellWithPin.qml+13−6

This diff is too big to show here.

tests/utils/modules/Unity/Test/UnityTestCase.qml+3−2

This diff is too big to show here.

tools/registry-tracker.cpp+6

This diff is too big to show here.

tools/scopetool.cpp+3

This diff is too big to show here.

tools/unlock-device+14−19

This diff is too big to show here.