moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-12-24 00:28:49 -05:00
Code Issues Releases Wiki Activity

Merge branch 'master' into issue549

Browse Source 
Conflicts:
	res/values/strings.xml
	src/com/fsck/k9/service/MailService.java
This commit is contained in:
cketti 2011-10-29 05:22:07 +02:00
commit 807907cb9e
44 changed files with 2230 additions and 1023 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
android:versionCode="14007"
android:versionName="3.907" package="com.fsck.k9"
android:versionCode="14008"
android:versionName="3.908" package="com.fsck.k9"
>
<uses-sdk
android:minSdkVersion="7"

23
ant.properties Normal file
View File

@ -0,0 +1,23 @@
# This file is used to override default values used by the Ant build system.
#
# This file must be checked in Version Control Systems, as it is
# integral to the build system of your project.
# This file is only used by the Ant script.
# You can use this to override default values such as
# 'source.dir' for the location of your java source folder and
# 'out.dir' for the location of your output folder.
# You can also use it define how the release builds are signed by declaring
# the following properties:
# 'key.store' for the location of your keystore and
# 'key.alias' for the name of the key to use.
# The password will be asked during the build when you use the 'release' target.
# Indicates whether an apk should be generated for each density.
split.density=false
java.encoding=utf8
# Project target.
target=android-9
extensible.libs.classpath=compile-only-libs

2
build.properties
View File

@ -1,2 +0,0 @@
application-package=com.fsck.k9
target=android-9

218
build.xml
View File

@ -1,15 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="K9" default="help">
<!-- The local.properties file is created and updated by the 'android'
tool.
It contains the path to the SDK. It should *NOT* be checked into
Version Control Systems. -->
<property file="local.properties" />
<!-- The local.properties file is created and updated by the 'android' tool.
It contains the path to the SDK. It should *NOT* be checked into
Version Control Systems. -->
<loadproperties srcFile="local.properties" />
<!-- The build.properties file can be created by you and is never touched
by the 'android' tool. This is the place to change some of the
default property values used by the Ant rules.
<!-- The ant.properties file can be created by you. It is only edited by the
'android' tool to add properties to it.
This is the place to change some Ant specific build properties.
Here are some properties you may want to change/update:
source.dir
@ -17,6 +16,9 @@
out.dir
The name of the output directory. Default is 'bin'.
For other overridable properties, look at the beginning of the rules
files in the SDK, at tools/ant/build.xml
Properties related to the SDK location or the project target should
be updated using the 'android' tool with the 'update' action.
@ -24,87 +26,119 @@
application and should be checked into Version Control Systems.
-->
<property file="build.properties" />
<property file="ant.properties" />
<!-- The default.properties file is created and updated by the 'android'
<!-- The project.properties file is created and updated by the 'android'
tool, as well as ADT.
This contains project specific properties such as project target, and library
dependencies. Lower level build properties are stored in ant.properties
(or in .classpath for Eclipse projects).
This file is an integral part of the build system for your
application and should be checked into Version Control Systems. -->
<property file="default.properties" />
<loadproperties srcFile="project.properties" />
<!-- Custom Android task to deal with the project target, and import the
proper rules.
This requires ant 1.6.0 or above. -->
<path id="android.antlibs">
<pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
<pathelement path="${sdk.dir}/tools/lib/sdklib.jar" />
<pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" />
</path>
<!-- quick check on sdk.dir -->
<fail
message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'"
unless="sdk.dir"
/>
<taskdef name="setup"
classname="com.android.ant.SetupTask"
classpathref="android.antlibs" />
<!-- out folders for a parent project if this project is an instrumentation project -->
<property name="rclib" value="${out.dir}/K9RemoteControl.jar" />
<property name="rcdir" value="com/fsck/k9/remotecontrol/**" />
<!-- A bloody hack, but a useful and quick one -->
<target name="get-version">
<exec executable="perl" failonerror="true" outputproperty="version-name" errorproperty="version-error">
<!-- yes, ant needs &quot; for " in doublequoted strings. -->
<arg line="-ne'/android:versionName.*?=.*?&quot;(.*?)&quot;/ ? print $1 : undef ' AndroidManifest.xml" />
</exec>
<echo>Building version number ${version-name}</echo>
<!-- extension targets. Uncomment the ones where you want to do custom work
in between standard targets -->
<!--
<target name="-pre-build">
</target>
<target name="-pre-compile">
</target>
<target name="get-version-from-git">
<exec executable="git" failonerror="true" outputproperty="version-name" errorproperty="version-error">
<arg line="describe --tags"/>
</exec>
<echo>Building version number ${version-name}</echo>
/* This is typically used for code obfuscation.
Compiled code location: ${out.classes.absolute.dir}
If this is not done in place, override ${out.dex.input.absolute.dir} */
<target name="-post-compile">
</target>
-->
<target name="set-version">
<echo>Setting version to ${version-name}</echo>
<fail unless="version-name">You can't set the version without passing -Dversion-name=1.234</fail>
<exec executable="perl" failonerror="true">
<arg line="-p -i.bak -e's/(?&lt;=android:versionName=&quot;)(.*?)(?=&quot;)/${version-name}/' AndroidManifest.xml"/>
</exec>
<exec executable="perl" failonerror="true">
<arg line="-p -i.bak -e's/(?&lt;=android:versionCode=&quot;)(\d+)(?=&quot;)/$1+1/e' AndroidManifest.xml" />
</exec>
</target>
<!-- Import the actual build file.
<!-- rules -->
<target name="bump-version" depends="set-version,commit-version">
<echo>Bumping K-9 to ${version-name}</echo>
</target>
To customize existing targets, there are two options:
- Customize only one target:
- copy/paste the target into this file, *before* the
<import> task.
- customize it to your needs.
- Customize the whole content of build.xml
- copy/paste the content of the rules files (minus the top node)
into this file, replacing the <import> task.
- customize to your needs.
<target name="commit-version">
<exec executable="git" failonerror="true">
<arg line="commit -m'Bumped manifest to ${version-name}' AndroidManifest.xml"/>
</exec>
<exec executable="git" failonerror="true">
<arg line="tag ${version-name}"/>
</exec>
<exec executable="git" failonerror="true">
<arg line="push"/>
</exec>
<exec executable="git" failonerror="true">
<arg line="push tag ${version-name}"/>
</exec>
</target>
***********************
****** IMPORTANT ******
***********************
In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
in order to avoid having your file be overridden by tools such as "android update project"
-->
<!-- version-tag: custom -->
<!-- K9 CUSTOM STUFF -->
<!-- out folders for a parent project if this project is an instrumentation project -->
<property name="rclib" value="${out.dir}/K9RemoteControl.jar" />
<property name="rcdir" value="com/fsck/k9/remotecontrol/**" />
<!-- A bloody hack, but a useful and quick one -->
<target name="get-version">
<exec executable="perl" failonerror="true" outputproperty="version-name" errorproperty="version-error">
<!-- yes, ant needs &quot; for " in doublequoted strings. -->
<arg line="-ne'/android:versionName.*?=.*?&quot;(.*?)&quot;/ ? print $1 : undef ' AndroidManifest.xml" />
</exec>
<echo>Building version number ${version-name}</echo>
</target>
<target name="get-version-from-git">
<exec executable="git" failonerror="true" outputproperty="version-name" errorproperty="version-error">
<arg line="describe --tags"/>
</exec>
<echo>Building version number ${version-name}</echo>
</target>
<target name="set-version">
<echo>Setting version to ${version-name}</echo>
<fail unless="version-name">You can't set the version without passing -Dversion-name=1.234</fail>
<exec executable="perl" failonerror="true">
<arg line="-p -i.bak -e's/(?&lt;=android:versionName=&quot;)(.*?)(?=&quot;)/${version-name}/' AndroidManifest.xml"/>
</exec>
<exec executable="perl" failonerror="true">
<arg line="-p -i.bak -e's/(?&lt;=android:versionCode=&quot;)(\d+)(?=&quot;)/$1+1/e' AndroidManifest.xml" />
</exec>
</target>
<!-- rules -->
<target name="bump-version" depends="set-version,commit-version">
<echo>Bumping K-9 to ${version-name}</echo>
</target>
<target name="commit-version">
<exec executable="git" failonerror="true">
<arg line="commit -m'Bumped manifest to ${version-name}' AndroidManifest.xml"/>
</exec>
<exec executable="git" failonerror="true">
<arg line="tag ${version-name}"/>
</exec>
<exec executable="git" failonerror="true">
<arg line="push"/>
</exec>
<exec executable="git" failonerror="true">
<arg line="push tag ${version-name}"/>
</exec>
</target>
<!-- Create the output directories if they don't exist yet. -->
<target name="rclib" depends="compile">
<echo>Creating library ${rclib} for remote control
applications</echo>
<jar destfile="${rclib}" basedir="${out.classes.dir}" includes="${rcdir}" />
<target name="rclib" depends="-compile">
<echo>Creating library ${rclib} for remote control applications</echo>
<jar destfile="${rclib}" basedir="${out.classes.dir}" includes="${rcdir}" />
</target>
<target name="upload" depends="clean,get-version,release">
<echo>Uploading to Google Code using Google::Code::Upload</echo>
<exec executable="mv" failonerror="true">
@ -125,7 +159,7 @@
<arg value="bin/k9-${version-name}-release.apk" />
</exec>
</target>
<!-- Install the package on the default emulator -->
<target name="install" depends="debug">
<echo>Installing ${out.debug.file} onto default emulator...</echo>
@ -134,12 +168,20 @@
<arg path="${out.debug.file}" />
</exec>
</target>
<!-- Re-Install the package on the default emulator -->
<target name="reinstall" depends="debug">
<echo>Reinstalling ${out.debug.file} onto default emulator...</echo>
<exec executable="${adb}" failonerror="true">
<arg value="install" />
<arg value="-r" />
<arg path="${out.debug.file}" />
</exec>
</target>
<target name="astyle">
<exec executable="astyle" failonerror="true">
<arg line="--style=java --indent=spaces=4 --brackets=attach --convert-tabs --unpad-paren --pad-header --pad-oper --suffix=none --recursive 'src/com/fsck/k9/*.java'"/>
</exec>
</target>
</target>
<target name="help">
<!-- displays starts at col 13
|13 80| -->
@ -160,28 +202,7 @@
<echo> Bumps the project version to 3.123,tags and commits it</echo>
<echo> astyle: Make K-9's source look like it's supposed to</echo>
<echo> eclipse: Apply template Eclipse settings</echo>
</target>
<!-- Execute the Android Setup task that will setup some properties
specific to the target, and import the build rules files.
The rules file is imported from
<SDK>/platforms/<target_platform>/ant/ant_rules_r#.xml
To customize existing targets, there are two options:
- Customize only one target:
- copy/paste the target into this file, *before* the
<setup> task.
- customize it to your needs.
- Customize the whole script.
- copy/paste the content of the rules files (minus the top node)
into this file, *after* the <setup> task
- disable the import of the rules by changing the setup task
below to <setup import="false" />.
- customize to your needs.
-->
<setup />
</target>
<target name="eclipse" description="Apply template Eclipse settings">
<copy todir=".settings">
@ -189,4 +210,7 @@
</copy>
</target>
<!-- END K-9 STUFF-->
<import file="${sdk.dir}/tools/ant/build.xml" />
</project>

936
docs/activity_diagram.graphml Normal file
View File

@ -0,0 +1,936 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<graphml xmlns="http://graphml.graphdrawing.org/xmlns" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:y="http://www.yworks.com/xml/graphml" xmlns:yed="http://www.yworks.com/xml/yed/3" xsi:schemaLocation="http://graphml.graphdrawing.org/xmlns http://www.yworks.com/xml/schema/graphml/1.1/ygraphml.xsd">
<!--Created by yFiles for Java 2.8-->
<key for="graphml" id="d0" yfiles.type="resources"/>
<key for="port" id="d1" yfiles.type="portgraphics"/>
<key for="port" id="d2" yfiles.type="portgeometry"/>
<key for="port" id="d3" yfiles.type="portuserdata"/>
<key attr.name="url" attr.type="string" for="node" id="d4"/>
<key attr.name="description" attr.type="string" for="node" id="d5"/>
<key for="node" id="d6" yfiles.type="nodegraphics"/>
<key attr.name="Beschreibung" attr.type="string" for="graph" id="d7"/>
<key attr.name="url" attr.type="string" for="edge" id="d8"/>
<key attr.name="description" attr.type="string" for="edge" id="d9"/>
<key for="edge" id="d10" yfiles.type="edgegraphics"/>
<graph edgedefault="directed" id="G">
<data key="d7"/>
<node id="n0">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="195.0" width="146.25" x="577.5003968253968" y="628.6116356979405"/>
<y:Fill color="#CCCCCC" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="internal" modelPosition="c" textColor="#000000" visible="true" width="53.359375" x="46.4453125" y="88.1494140625">Accounts</y:NodeLabel>
<y:Shape type="rectangle"/>
</y:ShapeNode>
</data>
</node>
<node id="n1">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="195.0" width="146.25" x="507.656746031746" y="913.6116356979405"/>
<y:Fill color="#CCCCCC" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="internal" modelPosition="c" textColor="#000000" visible="true" width="56.6875" x="44.78125" y="88.1494140625">FolderList</y:NodeLabel>
<y:Shape type="rectangle"/>
</y:ShapeNode>
</data>
</node>
<node id="n2">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="195.0" width="146.25" x="325.5472222222222" y="1168.6116356979405"/>
<y:Fill color="#CCCCCC" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="internal" modelPosition="c" textColor="#000000" visible="true" width="71.365234375" x="37.4423828125" y="88.1494140625">MessageList</y:NodeLabel>
<y:Shape type="rectangle"/>
</y:ShapeNode>
</data>
</node>
<node id="n3">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="195.0" width="146.25" x="191.25" y="118.61163569794053"/>
<y:Fill color="#CCCCCC" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="internal" modelPosition="c" textColor="#000000" visible="true" width="78.701171875" x="33.7744140625" y="88.1494140625">MessageView</y:NodeLabel>
<y:Shape type="rectangle"/>
</y:ShapeNode>
</data>
</node>
<node id="n4">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="195.0" width="146.25" x="405.0003968253968" y="1468.6116356979405"/>
<y:Fill color="#CCCCCC" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="internal" modelPosition="c" textColor="#000000" visible="true" width="90.71875" x="27.765625" y="88.1494140625">AccountSettings</y:NodeLabel>
<y:Shape type="rectangle"/>
</y:ShapeNode>
</data>
</node>
<node id="n5">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="195.0" width="146.25" x="669.3753968253968" y="1738.6116356979405"/>
<y:Fill color="#CCCCCC" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="internal" modelPosition="c" textColor="#000000" visible="true" width="127.41015625" x="9.419921875" y="88.1494140625">AccountSetupIncoming</y:NodeLabel>
<y:Shape type="rectangle"/>
</y:ShapeNode>
</data>
</node>
<node id="n6">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="195.0" width="146.25" x="596.2503968253968" y="1963.6116356979405"/>
<y:Fill color="#CCCCCC" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="internal" modelPosition="c" textColor="#000000" visible="true" width="127.421875" x="9.4140625" y="88.1494140625">AccountSetupOutgoing</y:NodeLabel>
<y:Shape type="rectangle"/>
</y:ShapeNode>
</data>
</node>
<node id="n7">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="195.0" width="146.25" x="581.2503968253968" y="1468.6116356979405"/>
<y:Fill color="#CCCCCC" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="internal" modelPosition="c" textColor="#000000" visible="true" width="32.0078125" x="57.12109375" y="88.1494140625">Prefs</y:NodeLabel>
<y:Shape type="rectangle"/>
</y:ShapeNode>
</data>
</node>
<node id="n8">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="195.0" width="146.25" x="845.6253968253968" y="1738.6116356979405"/>
<y:Fill color="#CCCCCC" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="internal" modelPosition="c" textColor="#000000" visible="true" width="94.71484375" x="25.767578125" y="88.1494140625">FontSizeSettings</y:NodeLabel>
<y:Shape type="rectangle"/>
</y:ShapeNode>
</data>
</node>
<node id="n9">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="195.0" width="146.25" x="559.6876984126984" y="2204.1116356979405"/>
<y:Fill color="#CCCCCC" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="internal" modelPosition="c" textColor="#000000" visible="true" width="120.07421875" x="13.087890625" y="88.1494140625">AccountSetupOptions</y:NodeLabel>
<y:Shape type="rectangle"/>
</y:ShapeNode>
</data>
</node>
<node id="n10">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="195.0" width="146.25" x="912.1876984126984" y="2429.1116356979405"/>
<y:Fill color="#CCCCCC" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="internal" modelPosition="c" textColor="#000000" visible="true" width="116.728515625" x="14.7607421875" y="88.1494140625">AccountSetupNames</y:NodeLabel>
<y:Shape type="rectangle"/>
</y:ShapeNode>
</data>
</node>
<node id="n11">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="195.0" width="146.25" x="493.1253968253968" y="1738.6116356979405"/>
<y:Fill color="#CCCCCC" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="internal" modelPosition="c" textColor="#000000" visible="true" width="145.416015625" x="0.4169921875" y="88.1494140625">AccountSetupComposition</y:NodeLabel>
<y:Shape type="rectangle"/>
</y:ShapeNode>
</data>
</node>
<node id="n12">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="195.0" width="146.25" x="751.4376984126984" y="2204.1116356979405"/>
<y:Fill color="#CCCCCC" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="internal" modelPosition="c" textColor="#000000" visible="true" width="156.091796875" x="-4.9208984375" y="88.1494140625">AccountSetupCheckSettings</y:NodeLabel>
<y:Shape type="rectangle"/>
</y:ShapeNode>
</data>
</node>
<node id="n13">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="195.0" width="146.25" x="900.0003968253968" y="1168.6116356979405"/>
<y:Fill color="#CCCCCC" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="internal" modelPosition="c" textColor="#000000" visible="true" width="114.0625" x="16.09375" y="88.1494140625">AccountSetupBasics</y:NodeLabel>
<y:Shape type="rectangle"/>
</y:ShapeNode>
</data>
</node>
<node id="n14">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="195.0" width="146.25" x="844.3722222222223" y="1468.6116356979405"/>
<y:Fill color="#CCCCCC" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="internal" modelPosition="c" textColor="#000000" visible="true" width="148.755859375" x="-1.2529296875" y="88.1494140625">AccountSetupAccountType</y:NodeLabel>
<y:Shape type="rectangle"/>
</y:ShapeNode>
</data>
</node>
<node id="n15">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="195.0" width="146.25" x="228.75039682539682" y="1468.6116356979405"/>
<y:Fill color="#CCCCCC" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="internal" modelPosition="c" textColor="#000000" visible="true" width="81.373046875" x="32.4384765625" y="88.1494140625">FolderSettings</y:NodeLabel>
<y:Shape type="rectangle"/>
</y:ShapeNode>
</data>
</node>
<node id="n16">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="195.0" width="146.25" x="210.00039682539682" y="628.6116356979405"/>
<y:Fill color="#CCCCCC" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="internal" modelPosition="c" textColor="#000000" visible="true" width="88.720703125" x="28.7646484375" y="88.1494140625">ChooseAccount</y:NodeLabel>
<y:Shape type="rectangle"/>
</y:ShapeNode>
</data>
</node>
<node id="n17">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="195.0" width="146.25" x="140.62539682539682" y="1738.6116356979405"/>
<y:Fill color="#CCCCCC" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="internal" modelPosition="c" textColor="#000000" visible="true" width="79.375" x="33.4375" y="88.1494140625">ChooseFolder</y:NodeLabel>
<y:Shape type="rectangle"/>
</y:ShapeNode>
</data>
</node>
<node id="n18">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="195.0" width="146.25" x="386.2503968253968" y="628.6116356979405"/>
<y:Fill color="#CCCCCC" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="internal" modelPosition="c" textColor="#000000" visible="true" width="84.05078125" x="31.099609375" y="88.1494140625">ChooseIdentity</y:NodeLabel>
<y:Shape type="rectangle"/>
</y:ShapeNode>
</data>
</node>
<node id="n19">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="195.0" width="146.25" x="316.8753968253968" y="1963.6116356979405"/>
<y:Fill color="#CCCCCC" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="internal" modelPosition="c" textColor="#000000" visible="true" width="63.3671875" x="41.44140625" y="88.1494140625">EditIdentity</y:NodeLabel>
<y:Shape type="rectangle"/>
</y:ShapeNode>
</data>
</node>
<node id="n20">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="195.0" width="146.25" x="15.0" y="118.61163569794053"/>
<y:Fill color="#CCCCCC" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="internal" modelPosition="c" textColor="#000000" visible="true" width="104.728515625" x="20.7607421875" y="88.1494140625">LauncherShortcuts</y:NodeLabel>
<y:Shape type="rectangle"/>
</y:ShapeNode>
</data>
</node>
<node id="n21">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="195.0" width="146.25" x="316.8753968253968" y="1738.6116356979405"/>
<y:Fill color="#CCCCCC" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="internal" modelPosition="c" textColor="#000000" visible="true" width="95.39453125" x="25.427734375" y="88.1494140625">ManageIdentities</y:NodeLabel>
<y:Shape type="rectangle"/>
</y:ShapeNode>
</data>
</node>
<node id="n22">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="195.0" width="146.25" x="276.5626984126984" y="358.6116356979405"/>
<y:Fill color="#CCCCCC" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="internal" modelPosition="c" textColor="#000000" visible="true" width="104.048828125" x="21.1005859375" y="88.1494140625">MessageCompose</y:NodeLabel>
<y:Shape type="rectangle"/>
</y:ShapeNode>
</data>
</node>
<node id="n23">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="58.61163569794053" width="146.25" x="357.1878968253968" y="0.0"/>
<y:Fill color="#999999" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="internal" modelPosition="c" textColor="#000000" visible="true" width="92.037109375" x="27.1064453125" y="19.955231911470264">Other Apps / OS</y:NodeLabel>
<y:Shape type="rectangle"/>
</y:ShapeNode>
</data>
</node>
<node id="n24">
<data key="d6">
<y:ShapeNode>
<y:Geometry height="195.0" width="146.25" x="401.2503968253968" y="118.61163569794053"/>
<y:Fill color="#CCCCCC" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="internal" modelPosition="c" textColor="#000000" visible="true" width="42.021484375" x="52.1142578125" y="88.1494140625">Search</y:NodeLabel>
<y:Shape type="rectangle"/>
</y:ShapeNode>
</data>
</node>
<edge id="e0" source="n0" target="n1">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="-20.89285714285714" sy="97.5" tx="18.28125" ty="-97.5">
<y:Point x="629.7325396825397" y="883.6116356979405"/>
<y:Point x="599.062996031746" y="883.6116356979405"/>
</y:Path>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e1" source="n1" target="n2">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="-60.9375" sy="97.5" tx="27.421875" ty="-97.5">
<y:Point x="519.844246031746" y="1123.6116356979405"/>
<y:Point x="426.0940972222222" y="1123.6116356979405"/>
</y:Path>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e2" source="n2" target="n3">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="-63.984375" sy="-97.5" tx="0.0" ty="97.5">
<y:Point x="334.6878472222222" y="1041.1116356979405"/>
<y:Point x="180.00039682539682" y="1041.1116356979405"/>
<y:Point x="180.00039682539682" y="343.6116356979405"/>
<y:Point x="264.375" y="343.6116356979405"/>
</y:Path>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e3" source="n3" target="n22">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="48.75" sy="97.5" tx="-36.5625" ty="-97.5"/>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e4" source="n2" target="n22">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="-45.703125" sy="-97.5" tx="-60.9375" ty="97.5">
<y:Point x="352.9690972222222" y="1026.1116356979405"/>
<y:Point x="195.00039682539682" y="1026.1116356979405"/>
<y:Point x="195.00039682539682" y="568.6116356979405"/>
<y:Point x="288.7501984126984" y="568.6116356979405"/>
</y:Path>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e5" source="n0" target="n7">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="41.785714285714334" sy="97.5" tx="48.75" ty="-97.5">
<y:Point x="692.4111111111112" y="853.6116356979405"/>
<y:Point x="703.1253968253968" y="853.6116356979405"/>
</y:Path>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e6" source="n0" target="n13">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="62.678571428571445" sy="97.5" tx="0.0" ty="-97.5">
<y:Point x="713.3039682539683" y="838.6116356979405"/>
<y:Point x="973.1253968253968" y="838.6116356979405"/>
</y:Path>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e7" source="n0" target="n4">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="20.89285714285711" sy="97.5" tx="48.75" ty="-97.5">
<y:Point x="671.5182539682539" y="1453.6116356979405"/>
<y:Point x="526.8753968253968" y="1453.6116356979405"/>
</y:Path>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e8" source="n0" target="n2">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="-62.678571428571445" sy="97.5" tx="-9.140625" ty="-97.5">
<y:Point x="587.9468253968254" y="853.6116356979405"/>
<y:Point x="389.531746031746" y="853.6116356979405"/>
</y:Path>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e9" source="n1" target="n0">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="54.84375" sy="-97.5" tx="0.0" ty="97.5">
<y:Point x="635.625496031746" y="898.6116356979405"/>
<y:Point x="650.6253968253968" y="898.6116356979405"/>
</y:Path>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e10" source="n1" target="n7">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="60.9375" sy="97.5" tx="0.0" ty="-97.5">
<y:Point x="641.719246031746" y="1123.6116356979405"/>
<y:Point x="654.3753968253968" y="1123.6116356979405"/>
</y:Path>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e11" source="n1" target="n4">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="36.5625" sy="97.5" tx="0.0" ty="-97.5">
<y:Point x="617.344246031746" y="1123.6116356979405"/>
<y:Point x="607.9690476190476" y="1123.6116356979405"/>
<y:Point x="607.9690476190476" y="1423.6116356979405"/>
<y:Point x="478.1253968253968" y="1423.6116356979405"/>
</y:Path>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e12" source="n1" target="n15">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="12.1875" sy="97.5" tx="36.5625" ty="-97.5">
<y:Point x="592.9690476190476" y="1408.6116356979405"/>
<y:Point x="338.4378968253968" y="1408.6116356979405"/>
</y:Path>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e13" source="n1" target="n22">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="-54.84375" sy="-97.5" tx="36.5625" ty="97.5">
<y:Point x="525.937996031746" y="838.6116356979405"/>
<y:Point x="547.5003968253968" y="838.6116356979405"/>
<y:Point x="547.5003968253968" y="583.6116356979405"/>
<y:Point x="386.2501984126984" y="583.6116356979405"/>
</y:Path>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e14" source="n1" target="n2">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="-36.5625" sy="97.5" tx="45.703125" ty="-97.5">
<y:Point x="544.219246031746" y="1138.6116356979405"/>
<y:Point x="444.3753472222222" y="1138.6116356979405"/>
</y:Path>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e15" source="n21" target="n19">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="97.5" tx="0.0" ty="-97.5"/>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e16" source="n22" target="n16">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="-36.5625" sy="97.5" tx="0.0" ty="-97.5">
<y:Point x="313.1251984126984" y="583.6116356979405"/>
<y:Point x="283.1253968253968" y="583.6116356979405"/>
</y:Path>
<y:LineStyle color="#000000" type="dashed" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e17" source="n22" target="n18">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="12.1875" sy="97.5" tx="0.0" ty="-97.5">
<y:Point x="361.8751984126984" y="598.6116356979405"/>
<y:Point x="459.3753968253968" y="598.6116356979405"/>
</y:Path>
<y:LineStyle color="#000000" type="dashed" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e18" source="n22" target="n0">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="60.9375" sy="97.5" tx="-36.5625" ty="-97.5">
<y:Point x="410.6251984126984" y="568.6116356979405"/>
<y:Point x="614.0628968253968" y="568.6116356979405"/>
</y:Path>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e19" source="n2" target="n17">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="-54.84375" sy="97.5" tx="0.0" ty="-97.5">
<y:Point x="343.8284722222222" y="1378.6116356979405"/>
<y:Point x="213.75039682539682" y="1378.6116356979405"/>
</y:Path>
<y:LineStyle color="#000000" type="dashed" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e20" source="n2" target="n0">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="9.140625" sy="-97.5" tx="-41.78571428571422" ty="97.5">
<y:Point x="407.8126984126984" y="868.6116356979405"/>
<y:Point x="608.8396825396826" y="868.6116356979405"/>
</y:Path>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e21" source="n2" target="n1">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="63.984375" sy="-97.5" tx="-12.1875" ty="97.5">
<y:Point x="462.6565972222222" y="1153.6116356979405"/>
<y:Point x="568.594246031746" y="1153.6116356979405"/>
</y:Path>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e22" source="n2" target="n7">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="54.84375" sy="97.5" tx="-48.75" ty="-97.5">
<y:Point x="453.5159722222222" y="1438.6116356979405"/>
<y:Point x="605.6253968253968" y="1438.6116356979405"/>
</y:Path>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e23" source="n2" target="n4">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="18.28125" sy="97.5" tx="-48.75" ty="-97.5">
<y:Point x="416.9534722222222" y="1423.6116356979405"/>
<y:Point x="429.3753968253968" y="1423.6116356979405"/>
</y:Path>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e24" source="n2" target="n22">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="-27.421875" sy="-97.5" tx="-12.1875" ty="97.5">
<y:Point x="371.2503968253968" y="613.6116356979405"/>
<y:Point x="337.5001984126984" y="613.6116356979405"/>
</y:Path>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e25" source="n2" target="n15">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="-18.28125" sy="97.5" tx="-36.5625" ty="-97.5">
<y:Point x="380.3909722222222" y="1393.6116356979405"/>
<y:Point x="265.3128968253968" y="1393.6116356979405"/>
</y:Path>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e26" source="n3" target="n17">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="-48.75" sy="97.5" tx="-48.75" ty="-97.5">
<y:Point x="215.625" y="328.6116356979405"/>
<y:Point x="165.00039682539682" y="328.6116356979405"/>
</y:Path>
<y:LineStyle color="#000000" type="dashed" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e27" source="n4" target="n21">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="-29.25" sy="97.5" tx="0.0" ty="-97.5">
<y:Point x="448.8753968253968" y="1693.6116356979405"/>
<y:Point x="390.0003968253968" y="1693.6116356979405"/>
</y:Path>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e28" source="n4" target="n17">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="-58.5" sy="97.5" tx="48.75" ty="-97.5">
<y:Point x="419.6253968253968" y="1678.6116356979405"/>
<y:Point x="262.5003968253968" y="1678.6116356979405"/>
</y:Path>
<y:LineStyle color="#000000" type="dashed" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e29" source="n4" target="n11">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="29.25" sy="97.5" tx="0.0" ty="-97.5">
<y:Point x="507.3753968253968" y="1723.6116356979405"/>
<y:Point x="566.2503968253968" y="1723.6116356979405"/>
</y:Path>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e30" source="n4" target="n5">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="58.5" sy="97.5" tx="-36.5625" ty="-97.5">
<y:Point x="536.6253968253968" y="1708.6116356979405"/>
<y:Point x="705.9378968253968" y="1708.6116356979405"/>
</y:Path>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e31" source="n4" target="n6">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="97.5" tx="-36.5625" ty="-97.5">
<y:Point x="478.1253968253968" y="1948.6116356979405"/>
<y:Point x="632.8128968253968" y="1948.6116356979405"/>
</y:Path>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e32" source="n14" target="n5">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="97.5" tx="36.5625" ty="-97.5">
<y:Point x="917.4972222222223" y="1678.6116356979405"/>
<y:Point x="779.0628968253968" y="1678.6116356979405"/>
</y:Path>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e33" source="n13" target="n12">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="97.5" tx="54.84375" ty="-97.5">
<y:Point x="973.1253968253968" y="1378.6116356979405"/>
<y:Point x="1006.8753968253968" y="1378.6116356979405"/>
<y:Point x="1006.8753968253968" y="2076.1116356979405"/>
<y:Point x="879.4064484126984" y="2076.1116356979405"/>
</y:Path>
<y:LineStyle color="#000000" type="dashed" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e34" source="n12" target="n12">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="-54.84375" sy="-97.5" tx="-73.125" ty="0.0">
<y:Point x="769.7189484126984" y="2188.6116356979405"/>
<y:Point x="735.9376984126984" y="2188.6116356979405"/>
<y:Point x="735.9376984126984" y="2301.6116356979405"/>
</y:Path>
<y:LineStyle color="#000000" type="dashed" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e35" source="n5" target="n6">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="-36.5625" sy="97.5" tx="36.5625" ty="-97.5"/>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e36" source="n5" target="n12">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="36.5625" sy="97.5" tx="18.28125" ty="-97.5">
<y:Point x="779.0628968253968" y="1948.6116356979405"/>
<y:Point x="842.8440476190476" y="1948.6116356979405"/>
</y:Path>
<y:LineStyle color="#000000" type="dashed" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e37" source="n9" target="n10">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="97.5" tx="-36.5625" ty="-97.5">
<y:Point x="632.8126984126984" y="2414.1116356979405"/>
<y:Point x="948.7501984126984" y="2414.1116356979405"/>
</y:Path>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e38" source="n6" target="n12">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="36.5625" sy="97.5" tx="-18.28125" ty="-97.5">
<y:Point x="705.9378968253968" y="2173.6116356979405"/>
<y:Point x="806.2814484126984" y="2173.6116356979405"/>
</y:Path>
<y:LineStyle color="#000000" type="dashed" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e39" source="n7" target="n8">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="97.5" tx="0.0" ty="-97.5">
<y:Point x="654.3753968253968" y="1693.6116356979405"/>
<y:Point x="918.7503968253968" y="1693.6116356979405"/>
</y:Path>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e40" source="n6" target="n9">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="-36.5625" sy="97.5" tx="0.0" ty="-97.5"/>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e41" source="n13" target="n10">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="48.75" sy="97.5" tx="36.5625" ty="-97.5"/>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e42" source="n13" target="n14">
<data key="d9"/>
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="-48.75" sy="97.5" tx="0.0" ty="-97.5">
<y:Point x="924.3753968253968" y="1378.6116356979405"/>
<y:Point x="917.4972222222223" y="1378.6116356979405"/>
</y:Path>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e43" source="n23" target="n20">
<data key="d9"/>
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="-60.9375" sy="29.305817848970264" tx="0.0" ty="-97.5">
<y:Point x="369.3753968253968" y="73.61163569794053"/>
<y:Point x="88.125" y="73.61163569794053"/>
</y:Path>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e44" source="n23" target="n3">
<data key="d9"/>
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="-36.5625" sy="29.305817848970264" tx="0.0" ty="-97.5">
<y:Point x="393.7503968253968" y="88.61163569794053"/>
<y:Point x="264.375" y="88.61163569794053"/>
</y:Path>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e45" source="n23" target="n22">
<data key="d9"/>
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="-12.1875" sy="29.305817848970264" tx="36.5625" ty="-97.5">
<y:Point x="418.1253968253968" y="103.61163569794053"/>
<y:Point x="386.2503968253968" y="103.61163569794053"/>
</y:Path>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e46" source="n23" target="n0">
<data key="d9"/>
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="60.9375" sy="29.305817848970264" tx="36.5625" ty="-97.5">
<y:Point x="491.2503968253968" y="73.61163569794053"/>
<y:Point x="687.1880952380952" y="73.61163569794053"/>
</y:Path>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e47" source="n23" target="n1">
<data key="d9"/>
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="36.5625" sy="29.305817848970264" tx="-18.28125" ty="-97.5">
<y:Point x="466.8753968253968" y="88.61163569794053"/>
<y:Point x="562.5003968253968" y="88.61163569794053"/>
</y:Path>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e48" source="n23" target="n24">
<data key="d9"/>
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="12.1875" sy="29.305817848970264" tx="0.0" ty="-97.5">
<y:Point x="442.5003968253968" y="103.61163569794053"/>
<y:Point x="474.3753968253968" y="103.61163569794053"/>
</y:Path>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
</graph>
<data key="d0">
<y:Resources/>
</data>
</graphml>

40
proguard.cfg Normal file
View File

@ -0,0 +1,40 @@
-optimizationpasses 5
-dontusemixedcaseclassnames
-dontskipnonpubliclibraryclasses
-dontpreverify
-verbose
-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
-keep public class * extends android.app.Activity
-keep public class * extends android.app.Application
-keep public class * extends android.app.Service
-keep public class * extends android.content.BroadcastReceiver
-keep public class * extends android.content.ContentProvider
-keep public class * extends android.app.backup.BackupAgentHelper
-keep public class * extends android.preference.Preference
-keep public class com.android.vending.licensing.ILicensingService
-keepclasseswithmembernames class * {
native <methods>;
}
-keepclasseswithmembers class * {
public <init>(android.content.Context, android.util.AttributeSet);
}
-keepclasseswithmembers class * {
public <init>(android.content.Context, android.util.AttributeSet, int);
}
-keepclassmembers class * extends android.app.Activity {
public void *(android.view.View);
}
-keepclassmembers enum * {
public static **[] values();
public static ** valueOf(java.lang.String);
}
-keep class * implements android.os.Parcelable {
public static final android.os.Parcelable$Creator *;
}

12
default.properties → project.properties
View File

@ -1,15 +1,15 @@
# This file is automatically generated by Android Tools.
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
#
#
# This file must be checked in Version Control Systems.
#
#
# To customize properties used by the Ant build system use,
# "build.properties", and override values to adapt the script to your
# "ant.properties", and override values to adapt the script to your
# project structure.
# Indicates whether an apk should be generated for each density.
split.density=false
# Project target.
target=android-10
extensible.libs.classpath=compile-only-libs
java.encoding=utf8
# Project target.
target=android-9
extensible.libs.classpath=compile-only-libs

42
res/values-ca/strings.xml
View File

@ -83,8 +83,6 @@
<string name="remove_account_action">Esborra el compte</string>
<string name="clear_pending_action">Suprimeix totes les accions pendents (Compte!)</string>
<string name="accounts_action">Comptes</string>
<string name="back_to_accounts_action">◀</string>
<string name="back_to_folder_list_action">◀</string>
@ -110,6 +108,9 @@
<string name="view_hide_details_action">Veu/amaga detalls</string>
<string name="add_cc_bcc_action">Afegeix Cc/Bcc</string>
<string name="edit_subject_action">Edita assumpte</string>
<!-- NEW: <string name="read_receipt">Read receipt</string>-->
<!-- NEW: <string name="read_receipt_enabled">Read receipt will be requested</string>-->
<!-- NEW: <string name="read_receipt_disabled">Read receipt will not be requested</string>-->
<string name="add_attachment_action">Afegeix adjunt</string>
<string name="add_attachment_action_image">Afegeix adjunt (Imatge)</string>
<string name="add_attachment_action_video">Afegeix adjunt (Vídeo)</string>
@ -265,11 +266,10 @@ Benvingut a la configuració del K-9. El K-9 és un client de codi obert per An
<string name="message_compose_reply_header_fmt"><xliff:g id="sender">%s</xliff:g> ha escrit:\n\n</string>
<string name="message_compose_quoted_text_label">Text citat</string>
<string name="message_compose_error_no_recipients">Has d’afegir-hi, com a mínim, un destinatari.</string>
<!-- NEW: <string name="error_contact_address_not_found">No email address could be found.</string>-->
<string name="error_contact_address_not_found">No s\'ha trobat cap adreça de correu.</string>
<string name="message_compose_downloading_attachments_toast">Alguns adjunts no s’han carregat. Es carregaran automàticament abans no s’enviï aquest missatge.</string>
<string name="message_compose_attachments_skipped_toast">Alguns adjunts no es poden reenviar perquè no s’han carregat.</string>
<!-- NEW: <string name="message_compose_show_quoted_text_action">Quote message</string>-->
<string name="message_view_from_format">De: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
<string name="message_to_label">A:</string>
@ -289,7 +289,6 @@ Benvingut a la configuració del K-9. El K-9 és un client de codi obert per An
<string name="message_view_fetching_attachment_toast">Recollint l’adjunt.</string>
<string name="message_view_no_viewer">No ha estat capaç de trobar un visualitzador per <xliff:g id="mimetype">%s</xliff:g>.</string>
<string name="message_view_download_remainder">Descarrega el missatge complet</string>
<!-- NOTE: The following message refers to strings with id 'account_setup_incoming_save_all_headers_label' and 'account_setup_incoming_title' -->
@ -316,7 +315,6 @@ Benvingut a la configuració del K-9. El K-9 és un client de codi obert per An
<string name="about_header">Sobre <xliff:g id="app_name">%s</xliff:g></string>
<string name="about_version">Versió: <xliff:g id="version">%s</xliff:g></string>
<string name="global_settings_flag_label">Mostra estels</string>
<string name="global_settings_flag_summary">Els estels indiquen els missatges senyalats</string>
<string name="global_settings_checkbox_label">Selecció múltiple</string>
@ -336,6 +334,8 @@ Benvingut a la configuració del K-9. El K-9 és un client de codi obert per An
<string name="global_settings_messageview_fixedwidth_summary">Utilitza una amplada fixa de lletra quan es mostri missatges de text net</string>
<string name="global_settings_messageview_return_to_list_label">Torna a la llista després esborrar</string>
<string name="global_settings_messageview_return_to_list_summary">Torna a la llista de missatges després esborrar missatges</string>
<!-- NEW: <string name="global_settings_messageview_show_next_label">Show next message after delete</string>-->
<!-- NEW: <string name="global_settings_messageview_show_next_summary">Show next message by default after message deletion</string>-->
<string name="global_settings_confirm_actions_title">Confirma accions</string>
<string name="global_settings_confirm_actions_summary">Mostra un diàleg cada vegada que executis accions seleccionades</string>
@ -348,13 +348,11 @@ Benvingut a la configuració del K-9. El K-9 és un client de codi obert per An
<string name="global_settings_privacy_mode_title">Bloca notificacions</string>
<string name="global_settings_privacy_mode_summary">No mostris l’assumpte del missatge a la barra de notificacions quan el telèfon estigui blocat</string>
<string name="quiet_time">Mode silenciós</string>
<string name="quiet_time_description">Deshabilita so de trucada, brunzit i llums durant la nit</string>
<string name="quiet_time_starts">Mode silenciós comença</string>
<string name="quiet_time_ends">Mode silenciós acaba</string>
<string name="account_setup_basics_title">Configura un compte nou</string>
<string name="account_setup_basics_instructions">Entra l’adreça de correu d’aquest compte:</string>
<string name="account_setup_basics_instructions2_fmt">(Pots afegir-hi <xliff:g id="number_accounts">%d</xliff:g> més comptes.)</string>
@ -517,7 +515,6 @@ Benvingut a la configuració del K-9. El K-9 és un client de codi obert per An
<string name="account_setup_options_mail_display_count_1000">1000 missatges</string>
<string name="account_setup_options_mail_display_count_all">Tots els missatges</string>
<string name="move_copy_cannot_copy_unsynced_message">No es pot copiar o moure un missatge que no està sincronitzat amb el servidor</string>
<string name="account_setup_failed_dlg_title">No s’ha pogut acabar la configuració</string>
@ -561,6 +558,9 @@ Benvingut a la configuració del K-9. El K-9 és un client de codi obert per An
<string name="account_settings_composition">Tramesa correu</string>
<!-- NEW: <string name="account_settings_default_quoted_text_shown_label">Quote original message when replying</string>-->
<!-- NEW: <string name="account_settings_default_quoted_text_shown_summary">When replying to messages, the original message is in your reply.</string>-->
<string name="account_settings_reply_after_quote_label">Contesta després del text citat</string>
<string name="account_settings_reply_after_quote_summary">Quan contestis, el missatge original apareixerà sobre de la contesta.</string>
@ -568,6 +568,9 @@ Benvingut a la configuració del K-9. El K-9 és un client de codi obert per An
<string name="account_settings_message_format_text">Text net (es trauran el format i les imatges)</string>
<string name="account_settings_message_format_html">HTML (es conservaran el format i les imatges)</string>
<!-- NEW: <string name="account_settings_message_read_receipt_label">Read receipt</string>-->
<!-- NEW: <string name="account_settings_message_read_receipt_summary">Always request a read receipt</string>-->
<string name="account_settings_quote_style_label">Contesta amb estil cita</string>
<string name="account_settings_quote_style_prefix">Prefix (com a Gmail, Pine)</string>
<string name="account_settings_quote_style_header">Capçalera (com a l’Outlook, Yahoo!, Hotmail)</string>
@ -591,7 +594,6 @@ Benvingut a la configuració del K-9. El K-9 és un client de codi obert per An
<string name="account_settings_storage_title">Emmagatzematge</string>
<string name="account_settings_color_label">Color del compte</string>
<string name="account_settings_color_summary">Tria el color del compte utilitzat a la llista de carpetes i de comptes</string>
@ -613,6 +615,8 @@ Benvingut a la configuració del K-9. El K-9 és un client de codi obert per An
<string name="account_settings_autodownload_message_size_512">512Kb</string>
<string name="account_settings_autodownload_message_size_1024">1Mb</string>
<string name="account_settings_autodownload_message_size_2048">2Mb</string>
<!-- NEW: <string name="account_settings_autodownload_message_size_5120">5Mb</string>-->
<!-- NEW: <string name="account_settings_autodownload_message_size_10240">10Mb</string>-->
<string name="account_settings_autodownload_message_size_any">qualsevol mida (sense límit)</string>
<string name="account_settings_message_age_label">Sincronitza des de</string>
@ -629,7 +633,6 @@ Benvingut a la configuració del K-9. El K-9 és un client de codi obert per An
<string name="account_settings_message_age_6_months">els darrers 6 mesos</string>
<string name="account_settings_message_age_1_year">el darrer any</string>
<string name="account_settings_folder_display_mode_label">Carpetes a mostrar</string>
<string name="account_settings_folder_display_mode_all">Tot</string>
<string name="account_settings_folder_display_mode_first_class">Només carpetes de 1a Classe</string>
@ -704,7 +707,6 @@ Benvingut a la configuració del K-9. El K-9 és un client de codi obert per An
<string name="account_settings_led_label">LED faci pampallugues</string>
<string name="account_settings_led_summary">Que el LED faci pampallugues quan arribi un correu</string>
<string name="account_settings_servers">Configuració del servidor</string>
<string name="account_settings_composition_title">Opcions de composició del missatge</string>
@ -752,7 +754,6 @@ Benvingut a la configuració del K-9. El K-9 és un client de codi obert per An
<string name="choose_account_title">Tria compte/identitat</string>
<string name="send_as">Envia com</string>
<string name="no_identities">Vés a la configuració del compte -&gt; Gestiona identitats per crear identitats</string>
<string name="no_removable_identity">No pots esborrar una identitat si només en tens una</string>
<string name="identity_has_no_email">No pots utilitzar una identitat sense una adreça de correu</string>
@ -794,8 +795,11 @@ Benvingut a la configuració del K-9. El K-9 és un client de codi obert per An
a la teva adreça i contrasenya correctes, pots no haver pagat
el compte \"Plus\". Si us plau, executeu el navegador d’Internet per obtenir accés a
aquests comptes de correu.</string>
<string name="provider_note_yahoojp">Si vols utilitzar POP3 per aquest proveïdor, hauries de permetre d’utilitzar POP3 a la pàgina de configuració del correu de Yahoo.</string>
<!-- NEW: <string name="provider_note_naver">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Naver mail settings page.</string>-->
<!-- NEW: <string name="provider_note_hanmail">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Hanmail(Daum) mail settings page.</string>-->
<!-- NEW: <string name="provider_note_paran">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Paran mail settings page.</string>-->
<!-- NEW: <string name="provider_note_nate">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Nate mail settings page.</string>-->
<string name="account_setup_failed_dlg_invalid_certificate_title">Certificat no reconegut</string>
<string name="account_setup_failed_dlg_invalid_certificate_accept">Accepta la clau</string>
@ -824,8 +828,6 @@ Benvingut a la configuració del K-9. El K-9 és un client de codi obert per An
<string name="folder_list_display_mode_first_and_second_class">Mostra carpetes de 1a i 2a Classe</string>
<string name="folder_list_display_mode_not_second_class">Mostra-ho tot excepte carpetes de 2a Classe</string>
<string name="account_settings_signature__location_label">Posició de la signatura</string>
<string name="account_settings_signature__location_before_quoted_text">Abans del text citat</string>
<string name="account_settings_signature__location_after_quoted_text">Després del text citat</string>
@ -848,8 +850,6 @@ Benvingut a la configuració del K-9. El K-9 és un client de codi obert per An
<string name="settings_messageview_zoom_controls_label">Controls zoom sistema</string>
<string name="settings_messageview_zoom_controls_summary">Habilita ginys de zoom or pica sobre el zoom si el teu aparell ho permet</string>
<string name="setting_language_system">Per defecte del sistema</string>
<string name="background_ops_label">Sincronització 2n pla</string>
@ -1055,4 +1055,8 @@ Benvingut a la configuració del K-9. El K-9 és un client de codi obert per An
<string name="settings_attachment_default_path">Desa adjunts a...</string>
<string name="attachment_save_title">Desa adjunt</string>
<string name="attachment_save_desc">No s\'ha trobat l\'arxiu al navegador. On vols desar l\'adjunt?</string>
<!-- NEW: <string name="manage_accounts_move_up_action">Move up</string>-->
<!-- NEW: <string name="manage_accounts_move_down_action">Move down</string>-->
</resources>

40
res/values-cs/strings.xml
View File

@ -88,8 +88,6 @@
<string name="remove_account_action">Odstranit účet</string>
<string name="clear_pending_action">Vynulovat nevyřízené akce (nebezpečné!)</string>
<string name="accounts_action">Účty</string>
<string name="back_to_accounts_action">◀</string>
<string name="back_to_folder_list_action">◀</string>
@ -115,6 +113,9 @@
<string name="view_hide_details_action">Zobrazit/skrýt podrobnosti</string>
<string name="add_cc_bcc_action">Přidat kopii/skrytou</string>
<string name="edit_subject_action">Upravit předmět</string>
<!-- NEW: <string name="read_receipt">Read receipt</string>-->
<!-- NEW: <string name="read_receipt_enabled">Read receipt will be requested</string>-->
<!-- NEW: <string name="read_receipt_disabled">Read receipt will not be requested</string>-->
<string name="add_attachment_action">Přidat přílohu</string>
<string name="add_attachment_action_image">Přidat přílohu (obrázek)</string>
<string name="add_attachment_action_video">Přidat přílohu (video)</string>
@ -274,8 +275,7 @@ Vítejte v nastavení pošty K-9 Mail. K-9 je open source poštovní klient pro
<!-- NEW: <string name="error_contact_address_not_found">No email address could be found.</string>-->
<string name="message_compose_downloading_attachments_toast">Některé přílohy nebyly staženy. Budou staženy automaticky, než bude tato zpráva odeslána.</string>
<string name="message_compose_attachments_skipped_toast">Některé přílohy nelze přeposlat, protože ještě nebyly staženy.</string>
<!-- NEW: <string name="message_compose_show_quoted_text_action">Quote message</string>-->
<string name="message_view_from_format">Odesílatel: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
<string name="message_to_label">Komu:</string>
@ -295,7 +295,6 @@ Vítejte v nastavení pošty K-9 Mail. K-9 je open source poštovní klient pro
<string name="message_view_fetching_attachment_toast">Stahuji přílohu.</string>
<string name="message_view_no_viewer">Nelze nalézt prohlížeč pro <xliff:g id="mimetype">%s</xliff:g>.</string>
<string name="message_view_download_remainder">Stáhnout úplnou zprávu</string>
<!-- NOTE: The following message refers to strings with id 'account_setup_incoming_save_all_headers_label' and 'account_setup_incoming_title' -->
@ -322,7 +321,6 @@ Vítejte v nastavení pošty K-9 Mail. K-9 je open source poštovní klient pro
<string name="about_header">O aplikaci<xliff:g id="app_name">%s</xliff:g></string>
<string name="about_version">Verze: <xliff:g id="version">%s</xliff:g></string>
<string name="global_settings_flag_label">Zprávy s \u2605</string>
<string name="global_settings_flag_summary">Hvězdička indikuje označenou zprávu</string>
<string name="global_settings_checkbox_label">Výběrová zaškrtávací pole</string>
@ -342,6 +340,8 @@ Vítejte v nastavení pošty K-9 Mail. K-9 je open source poštovní klient pro
<string name="global_settings_messageview_fixedwidth_summary">Použít písmo s pevnou šířkou při zobrazování textových zpráv</string>
<string name="global_settings_messageview_return_to_list_label">Návrat do seznamu po smazání</string>
<string name="global_settings_messageview_return_to_list_summary">Vrátit se do seznamu zpráv po smazání zprávy</string>
<!-- NEW: <string name="global_settings_messageview_show_next_label">Show next message after delete</string>-->
<!-- NEW: <string name="global_settings_messageview_show_next_summary">Show next message by default after message deletion</string>-->
<string name="global_settings_confirm_actions_title">Potvrzování akcí</string>
<string name="global_settings_confirm_actions_summary">Zobrazit dialog, když provádíte zvolené akce</string>
@ -354,13 +354,11 @@ Vítejte v nastavení pošty K-9 Mail. K-9 je open source poštovní klient pro
<string name="global_settings_privacy_mode_title">Oznámení při zamčené obrazovce</string>
<string name="global_settings_privacy_mode_summary">Nezobrazovat v oznámení předmět zpráv, když je systém zamčen</string>
<string name="quiet_time">Doba klidu</string>
<string name="quiet_time_description">Zakázat v noci zvonění, vibrace a blikání</string>
<string name="quiet_time_starts">Doba klidu začíná</string>
<string name="quiet_time_ends">Doba klidu končí</string>
<string name="account_setup_basics_title">Založit nový účet</string>
<string name="account_setup_basics_instructions">Zadejte emailovou adresu tohoto účtu:</string>
<string name="account_setup_basics_instructions2_fmt">(Můžete ještě přidat <xliff:g id="number_accounts">%d</xliff:g> účtů.)</string> <!-- PLURALS: wrong!!! -->
@ -524,7 +522,6 @@ Vítejte v nastavení pošty K-9 Mail. K-9 je open source poštovní klient pro
<string name="account_setup_options_mail_display_count_1000">1000 zpráv</string>
<string name="account_setup_options_mail_display_count_all">všechny zprávy</string>
<string name="move_copy_cannot_copy_unsynced_message">Nelze kopírovat nebo přesunovat zprávu, která není synchronizována se serverem</string>
<string name="account_setup_failed_dlg_title">Konfiguraci nastavení nelze dokončit</string>
@ -568,6 +565,9 @@ Vítejte v nastavení pošty K-9 Mail. K-9 je open source poštovní klient pro
<string name="account_settings_composition">Odesílání zpráv</string>
<!-- NEW: <string name="account_settings_default_quoted_text_shown_label">Quote original message when replying</string>-->
<!-- NEW: <string name="account_settings_default_quoted_text_shown_summary">When replying to messages, the original message is in your reply.</string>-->
<string name="account_settings_reply_after_quote_label">Odpovědět za citovaným textem</string>
<string name="account_settings_reply_after_quote_summary">Při odpovídání na zprávu se původní zpráva objeví ned vaší odpovědí.</string>
@ -575,6 +575,9 @@ Vítejte v nastavení pošty K-9 Mail. K-9 je open source poštovní klient pro
<!-- NEW: <string name="account_settings_message_format_text">Plain Text (images and formatting will be removed)</string>-->
<!-- NEW: <string name="account_settings_message_format_html">HTML (images and formatting are preserved)</string>-->
<!-- NEW: <string name="account_settings_message_read_receipt_label">Read receipt</string>-->
<!-- NEW: <string name="account_settings_message_read_receipt_summary">Always request a read receipt</string>-->
<!-- NEW: <string name="account_settings_quote_style_label">Reply quoting style</string>-->
<!-- NEW: <string name="account_settings_quote_style_prefix">Prefix (like Gmail, Pine)</string>-->
<!-- NEW: <string name="account_settings_quote_style_header">Header (like Outlook, Yahoo!, Hotmail)</string>-->
@ -598,7 +601,6 @@ Vítejte v nastavení pošty K-9 Mail. K-9 je open source poštovní klient pro
<string name="account_settings_storage_title">Úložiště</string>
<string name="account_settings_color_label">Barva účtu</string>
<string name="account_settings_color_summary">Vyberte barvu účtu používanou v seznamech složek a zpráv</string>
@ -620,6 +622,8 @@ Vítejte v nastavení pošty K-9 Mail. K-9 je open source poštovní klient pro
<string name="account_settings_autodownload_message_size_512">512 KiB</string>
<string name="account_settings_autodownload_message_size_1024">1 MiB</string>
<string name="account_settings_autodownload_message_size_2048">2 MiB</string>
<string name="account_settings_autodownload_message_size_5120">5 MiB</string>
<string name="account_settings_autodownload_message_size_10240">10 MiB</string>
<string name="account_settings_autodownload_message_size_any">jakékoli velikosti (bez omezení)</string>
<string name="account_settings_message_age_label">Synchronizovat odeslané zprávy</string>
@ -636,7 +640,6 @@ Vítejte v nastavení pošty K-9 Mail. K-9 je open source poštovní klient pro
<string name="account_settings_message_age_6_months">za posledních 6 měsíců</string>
<string name="account_settings_message_age_1_year">za poslední rok</string>
<string name="account_settings_folder_display_mode_label">Zobrazované složky</string>
<string name="account_settings_folder_display_mode_all">Všechny</string>
<string name="account_settings_folder_display_mode_first_class">Jen složky 1. třídy</string>
@ -711,7 +714,6 @@ Vítejte v nastavení pošty K-9 Mail. K-9 je open source poštovní klient pro
<string name="account_settings_led_label">Blikání LED</string>
<string name="account_settings_led_summary">Blikat LED, když přijde pošta</string>
<string name="account_settings_servers">Nastavení serveru</string>
<string name="account_settings_composition_title">Možnosti tvorby nových zpráv</string>
@ -759,7 +761,6 @@ Vítejte v nastavení pošty K-9 Mail. K-9 je open source poštovní klient pro
<string name="choose_account_title">Vyberte účet/identitu</string>
<string name="send_as">Odeslat jako</string>
<string name="no_identities">Vytvořte identity v Nastavení účtu -&gt; Správa identit</string>
<string name="no_removable_identity">Nemůžete odebrat vaši jedinou zbývající identitu</string>
<string name="identity_has_no_email">Nemůžete použít identitu bez emailové adresy</string>
@ -801,8 +802,11 @@ Vítejte v nastavení pošty K-9 Mail. K-9 je open source poštovní klient pro
s vaší správnou emailovou adresou a heslem, nemusíte mít placený \"Plus\"
účet. Spusťte si prosím webový prohlížeč, kterým na takové účty získáte
přístup.</string>
<string name="provider_note_yahoojp">Pokud chcete používat POP3 s tímto poskytovatelem, měli byste povolit použití POP3 na stránce Nastavení pošty Yahoo.</string>
<!-- NEW: <string name="provider_note_naver">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Naver mail settings page.</string>-->
<!-- NEW: <string name="provider_note_hanmail">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Hanmail(Daum) mail settings page.</string>-->
<!-- NEW: <string name="provider_note_paran">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Paran mail settings page.</string>-->
<!-- NEW: <string name="provider_note_nate">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Nate mail settings page.</string>-->
<string name="account_setup_failed_dlg_invalid_certificate_title">Neznámý certifikát</string>
<string name="account_setup_failed_dlg_invalid_certificate_accept">Přijmout klíč</string>
@ -831,8 +835,6 @@ Vítejte v nastavení pošty K-9 Mail. K-9 je open source poštovní klient pro
<string name="folder_list_display_mode_first_and_second_class">Zobrazit složky 1. a 2. třídy</string>
<string name="folder_list_display_mode_not_second_class">Zobrazit všechny vyjma složek 2. třídy</string>
<string name="account_settings_signature__location_label">Umístění podpisu</string>
<string name="account_settings_signature__location_before_quoted_text">Před citovanými zprávami</string>
<string name="account_settings_signature__location_after_quoted_text">Za citovanými zprávami</string>
@ -855,8 +857,6 @@ Vítejte v nastavení pošty K-9 Mail. K-9 je open source poštovní klient pro
<string name="settings_messageview_zoom_controls_label">Systémové ovládání zvětšování</string>
<string name="settings_messageview_zoom_controls_summary">Povolit zvětšovací doplňky nebo zvětšování štípnutím, pokud to zařízení podporuje</string>
<string name="setting_language_system">Systémový výchozí</string>
<string name="background_ops_label">Synchronizace na pozadí</string>
@ -1061,4 +1061,8 @@ Vítejte v nastavení pošty K-9 Mail. K-9 je open source poštovní klient pro
<!-- NEW: <string name="settings_attachment_default_path">Save attachments to...</string>-->
<!-- NEW: <string name="attachment_save_title">Save attachment</string>-->
<!-- NEW: <string name="attachment_save_desc">No file browser found. Where would you like to save this attachment?</string>-->
<!-- NEW: <string name="manage_accounts_move_up_action">Move up</string>-->
<!-- NEW: <string name="manage_accounts_move_down_action">Move down</string>-->
</resources>

60
res/values-de/strings.xml
View File

@ -83,8 +83,6 @@
<string name="remove_account_action">Konto entfernen</string>
<string name="clear_pending_action">Ausstehende Aktionen abbrechen (Warnung!)</string>
<string name="accounts_action">Konten</string>
<string name="back_to_accounts_action">◀</string>
<string name="back_to_folder_list_action">◀</string>
@ -109,6 +107,9 @@
<string name="view_hide_details_action">Details anzeigen/verbergen</string>
<string name="add_cc_bcc_action">CC/BCC hinzufügen</string>
<string name="edit_subject_action">Betreff bearbeiten</string>
<string name="read_receipt">Empfangsbestätigung</string>
<string name="read_receipt_enabled">Eine Empfangsbestätigung wird angefordert.</string>
<string name="read_receipt_disabled">Es wird keine Empfangsbestätigung angefordert.</string>
<string name="add_attachment_action">Anhang hinzufügen</string>
<string name="add_attachment_action_image">Anhang hinzufügen (Bild)</string>
<string name="add_attachment_action_video">Anhang hinzufügen (Video)</string>
@ -265,8 +266,7 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="error_contact_address_not_found">Es wurde keine E-Mail-Adresse für diesen Kontakt gefunden.</string>
<string name="message_compose_downloading_attachments_toast">Einige Anhänge wurden nicht heruntergeladen. Sie werden automatisch heruntergeladen, bevor diese Nachricht gesendet wird.</string>
<string name="message_compose_attachments_skipped_toast">Einige Anhänge können nicht weitergeleitet werden, da diese nicht heruntergeladen wurden.</string>
<string name="message_compose_show_quoted_text_action">Original-Nachricht zitieren</string>
<string name="message_view_from_format">Von: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
<string name="message_to_label">An:</string>
@ -275,7 +275,7 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="message_view_attachment_download_action">Speichern</string>
<string name="message_view_prev_action">\u25BC</string>
<string name="message_view_next_action">\u25B2</string>
<string name="message_view_archive_action">Sichern</string>
<string name="message_view_archive_action">Archivieren</string>
<string name="message_view_move_action">Verschieben</string>
<string name="message_view_spam_action">Spam</string>
<string name="message_view_datetime_fmt">dd. MMM yyyy HH:mm</string>
@ -286,7 +286,6 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="message_view_fetching_attachment_toast">Lade Anhang.</string>
<string name="message_view_no_viewer">Es wurde kein Anzeigeprogramm für <xliff:g id="mimetype">%s</xliff:g> gefunden.</string>
<string name="message_view_download_remainder">Gesamte Nachricht herunterladen</string>
<!-- NOTE: The following message refers to strings with id 'account_setup_incoming_save_all_headers_label' and 'account_setup_incoming_title' -->
@ -313,7 +312,6 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="about_header">Über <xliff:g id="app_name">%s</xliff:g></string>
<string name="about_version">Version: <xliff:g id="version">%s</xliff:g></string>
<string name="global_settings_flag_label">Wichtige Nachrichten</string>
<string name="global_settings_flag_summary">Sterne weisen auf wichtige Nachrichten hin.</string>
<string name="global_settings_checkbox_label">Mehrfachauswahl</string>
@ -333,6 +331,8 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="global_settings_messageview_fixedwidth_summary">Verwende Schriftart mit gleicher Zeichenbreite für Plain-Text Nachrichten</string>
<string name="global_settings_messageview_return_to_list_label">Nach Löschen zurück</string>
<string name="global_settings_messageview_return_to_list_summary">Nach Löschen zur Nachrichtenliste zurückkehren</string>
<string name="global_settings_messageview_show_next_label">Nach Löschen nächste Nachricht</string>
<string name="global_settings_messageview_show_next_summary">Nach Löschen standardmäßig die nächste Nachricht anzeigen</string>
<string name="global_settings_confirm_actions_title">Bestätigungsdialog</string>
<string name="global_settings_confirm_actions_summary">Verlange Bestätigung bei gewissen Aktionen</string>
@ -345,13 +345,11 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="global_settings_privacy_mode_title">Vertrauliche Benachrichtigung</string>
<string name="global_settings_privacy_mode_summary">Der Betreff der Nachricht wird nicht in der Benachrichtigungszeile angezeigt</string>
<string name="quiet_time">Ruhezeit</string>
<string name="quiet_time_description">Deaktivere Klingeln, Vibrieren und Leuchten in der Nacht</string>
<string name="quiet_time_starts">Ruhezeit startet</string>
<string name="quiet_time_ends">Ruhezeit endet</string>
<string name="account_setup_basics_title">E-Mail-Konto einrichten</string>
<string name="account_setup_basics_instructions">E-Mail-Adresse Ihres Kontos:</string>
<string name="account_setup_basics_instructions2_fmt">(Sie können <xliff:g id="number_accounts">%d</xliff:g> weitere Konten hinzufügen.)</string>
@ -515,7 +513,6 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="account_setup_options_mail_display_count_1000">1000 Nachrichten</string>
<string name="account_setup_options_mail_display_count_all">alle Nachrichten</string>
<string name="move_copy_cannot_copy_unsynced_message">Nachrichten, die nicht mit dem Server synchronisiert wurden, können nicht kopiert oder verschoben werden.</string>
<string name="account_setup_failed_dlg_title">Setup konnte nicht abgeschlossen werden</string>
@ -549,7 +546,7 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="account_settings_hide_buttons_always">Immer</string>
<string name="account_settings_enable_move_buttons_label">Spam-Leiste</string>
<string name="account_settings_enable_move_buttons_summary">Zeige Sichern-, Verschieben- und Spam-Schaltfläche.</string>
<string name="account_settings_enable_move_buttons_summary">Zeige Archivieren-, Verschieben- und Spam-Schaltfläche.</string>
<string name="account_settings_hide_move_buttons_label">Scrolle Spam-Leiste</string>
<string name="account_settings_show_pictures_label">Bilder automatisch anzeigen</string>
@ -559,13 +556,19 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="account_settings_composition">Nachricht verfassen</string>
<string name="account_settings_default_quoted_text_shown_label">Nachricht beim Antworten zitieren</string>
<string name="account_settings_default_quoted_text_shown_summary">Beim Antworten die Original-Nachricht als Zitat einfügen.</string>
<string name="account_settings_reply_after_quote_label">Antwort unter Zitat</string>
<string name="account_settings_reply_after_quote_summary">Die Antwort auf eine Nachricht unterhalb der Originalnachricht platzieren.</string>
<string name="account_settings_reply_after_quote_summary">Die Antwort auf eine Nachricht unterhalb der Original-Nachricht platzieren.</string>
<string name="account_settings_message_format_label">Formatierung</string>
<string name="account_settings_message_format_text">Einfacher Text (Bilder und Formatierungen werden entfernt)</string>
<string name="account_settings_message_format_html">HTML (Bilder und Formatierungen bleiben erhalten)</string>
<string name="account_settings_message_read_receipt_label">Empfangsbestätigung</string>
<string name="account_settings_message_read_receipt_summary">Immer eine Empfangsbestätigung anfordern</string>
<string name="account_settings_quote_style_label">Antwortkopf</string>
<string name="account_settings_quote_style_prefix">Normal (wie in Gmail, Pine)</string>
<string name="account_settings_quote_style_header">Erweitert (wie in Outlook, Yahoo!, Hotmail)</string>
@ -589,7 +592,6 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="account_settings_storage_title">Speicher</string>
<string name="account_settings_color_label">Farbe des Kontos</string>
<string name="account_settings_color_summary">Wählen Sie die Farbe, in der das Konto in der Konten- und Ordnerliste dargestellt wird</string>
@ -611,6 +613,8 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="account_settings_autodownload_message_size_512">512Kb</string>
<string name="account_settings_autodownload_message_size_1024">1Mb</string>
<string name="account_settings_autodownload_message_size_2048">2Mb</string>
<string name="account_settings_autodownload_message_size_5120">5Mb</string>
<string name="account_settings_autodownload_message_size_10240">10Mb</string>
<string name="account_settings_autodownload_message_size_any">jede Größe (kein Limit)</string>
<string name="account_settings_message_age_label">Nachrichten synchronisieren</string>
@ -627,7 +631,6 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="account_settings_message_age_6_months">der letzten 6 Monate</string>
<string name="account_settings_message_age_1_year">des letzten Jahres</string>
<string name="account_settings_folder_display_mode_label">Ordner anzeigen</string>
<string name="account_settings_folder_display_mode_all">Alle</string>
<string name="account_settings_folder_display_mode_first_class">Nur Hauptordner</string>
@ -702,7 +705,6 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="account_settings_led_label">LED Blinken</string>
<string name="account_settings_led_summary">LED blinkt bei neuer Nachricht</string>
<string name="account_settings_servers">Servereinstellungen</string>
<string name="account_settings_composition_title">Optionen für das Verfassen von Nachrichten</string>
@ -750,7 +752,6 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="choose_account_title">Konto/Identität auswählen</string>
<string name="send_as">Sende als</string>
<string name="no_identities">Gehen Sie zu \"Kontoeinstellungen\" -&gt; \"Identitäten verwalten\" um Identitäten zu erstellen</string>
<string name="no_removable_identity">Sie können Ihre einzige Identität nicht löschen</string>
<string name="identity_has_no_email">Sie können keine Identität ohne E-Mail-Adresse verwenden</string>
@ -792,8 +793,11 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
der richtigen E-Mail-Adresse und dem richtigen Kennwort anmelden können, haben Sie möglicherweise die Gebühren für das
\"Plus\"-Konto nicht bezahlt. Starten Sie den Webbrowser, um auf
diese Mailkonten zuzugreifen.</string>
<string name="provider_note_yahoojp">Wenn Sie für diesen Provider POP3 verwenden möchten, sollten Sie in den "Yahoo! Mail"-Enstellungen POP3 aktivieren.</string>
<string name="provider_note_yahoojp">Wenn Sie für diesen Provider POP3 verwenden möchten, sollten Sie in den "Yahoo! Mail"-Einstellungen POP3 aktivieren.</string>
<string name="provider_note_naver">Wenn Sie für diesen Provider IMAP oder POP3 verwenden möchten, sollten Sie dies auf der "Naver Mail"-Einstellungsseite aktivieren.</string>
<string name="provider_note_hanmail">Wenn Sie für diesen Provider IMAP oder POP3 verwenden möchten, sollten Sie dies auf der "Hanmail(Daum)"-Einstellungsseite aktivieren.</string>
<string name="provider_note_paran">Wenn Sie für diesen Provider IMAP oder POP3 verwenden möchten, sollten Sie dies auf der "Paran"-Einstellungsseite aktivieren.</string>
<string name="provider_note_nate">Wenn Sie für diesen Provider IMAP oder POP3 verwenden möchten, sollten Sie dies auf der "Nate Mail"-Einstellungsseite aktivieren.</string>
<string name="account_setup_failed_dlg_invalid_certificate_title">Ungültiges Zertifikat</string>
<string name="account_setup_failed_dlg_invalid_certificate_accept">Zertifikat akzeptieren</string>
@ -821,8 +825,6 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="folder_list_display_mode_first_and_second_class">Haupt- und Nebenordner anzeigen</string>
<string name="folder_list_display_mode_not_second_class">Alle außer Nebenordner anzeigen</string>
<string name="account_settings_signature__location_label">Position der Signatur</string>
<string name="account_settings_signature__location_before_quoted_text">Vor zitierter Nachricht</string>
<string name="account_settings_signature__location_after_quoted_text">Nach zitierter Nachricht</string>
@ -845,8 +847,6 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="settings_messageview_zoom_controls_label">System Zoom</string>
<string name="settings_messageview_zoom_controls_summary">Aktiviere Zoom-Widgets oder 2-Finger-Zoom, wenn vom Gerät unterstützt</string>
<string name="setting_language_system">Systemvorgabe</string>
<string name="background_ops_label">Hintergrund-Synchronisierung</string>
@ -873,7 +873,7 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="batch_mark_unread_op">Gewählte als ungelesen markieren</string>
<string name="batch_flag_op">Gewählte als wichtig markieren</string>
<string name="batch_unflag_op">Markierung bei Gewählten entfernen</string>
<string name="batch_archive_op">Gewählte sichern</string>
<string name="batch_archive_op">Gewählte archivieren</string>
<string name="batch_spam_op">Gewählte als Spam markieren</string>
<string name="batch_move_op">Gewählte verschieben</string>
<string name="batch_copy_op">Gewählte kopieren</string>
@ -908,8 +908,8 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="manage_back_title">\"Zurück\"-Taste</string>
<string name="manage_back_summary">Die \"Zurück\"-Taste bringt Sie eine Ebene nach oben</string>
<string name="start_integrated_inbox_title">Integrierter Posteingang bei Start</string>
<string name="start_integrated_inbox_summary">Zeige beim Startup den integrierten Posteingang</string>
<string name="start_integrated_inbox_title">Gemeinsamer Posteingang bei Start</string>
<string name="start_integrated_inbox_summary">Zeige gemeinsamen Posteingang beim Programmstart</string>
<string name="measure_accounts_title">Konto-Größe anzeigen</string>
<string name="measure_accounts_summary">Deaktivieren für schnellere Anzeige</string>
@ -917,8 +917,8 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="count_search_title">Suchergebnisse zählen</string>
<string name="count_search_summary">Deaktivieren für schnellere Anzeige</string>
<!-- NEW: <string name="hide_special_accounts_title">Hide special accounts</string>-->
<!-- NEW: <string name="hide_special_accounts_summary">Hide the unified inbox and all messages accounts</string>-->
<string name="hide_special_accounts_title">Spezial-Konten verbergen</string>
<string name="hide_special_accounts_summary">"Gemeinsamer Posteingang" und "Alle Nachrichten" verbergen</string>
<string name="search_title"><xliff:g id="search_name">%s</xliff:g> <xliff:g id="modifier">%s</xliff:g></string>
<string name="flagged_modifier"> - Wichtig</string>
@ -1011,7 +1011,7 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="save_or_discard_draft_message_dlg_title">Entwurf speichern?</string>
<string name="save_or_discard_draft_message_instructions_fmt">Entwurf speichern oder verwerfen?</string>
<string name="charset_not_found">Die Nachricht konnte nicht dargestellt werden da das Charset \"<xliff:g id="charset">%s</xliff:g>\" nicht gefunden wurde.</string>
<string name="charset_not_found">Die Nachricht konnte nicht dargestellt werden, da das Charset \"<xliff:g id="charset">%s</xliff:g>\" nicht gefunden wurde.</string>
<string name="select_text_now">Selektieren Sie Text um ihn zu kopieren.</string>
@ -1041,4 +1041,8 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü
<string name="settings_attachment_default_path">Anhang speichern unter...</string>
<string name="attachment_save_title">Anhang speichern</string>
<string name="attachment_save_desc">Es wurde kein Dateimanager gefunden. Wo soll der Anhang abgelegt werden?</string>
<string name="manage_accounts_move_up_action">Nach oben verschieben</string>
<string name="manage_accounts_move_down_action">Nach unten verschieben</string>
</resources>

40
res/values-es/strings.xml
View File

@ -83,8 +83,6 @@
<string name="remove_account_action">Eliminar cuenta</string>
<string name="clear_pending_action">Limipar acciones pendientes (peligroso!)</string>
<string name="accounts_action">Cuentas</string>
<string name="back_to_accounts_action">◀</string>
<string name="back_to_folder_list_action">◀</string>
@ -109,6 +107,9 @@
<string name="view_hide_details_action">Ver/Ocultar detalles</string>
<string name="add_cc_bcc_action">Añadir Cc/Bcc</string>
<string name="edit_subject_action">Editar Asunto</string>
<!-- NEW: <string name="read_receipt">Read receipt</string>-->
<!-- NEW: <string name="read_receipt_enabled">Read receipt will be requested</string>-->
<!-- NEW: <string name="read_receipt_disabled">Read receipt will not be requested</string>-->
<string name="add_attachment_action">Añadir adjunto</string>
<string name="add_attachment_action_image">Añadir adjunto (Imagen)</string>
<string name="add_attachment_action_video">Añadir adjunto (Vídeo)</string>
@ -266,8 +267,7 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<!-- NEW: <string name="error_contact_address_not_found">No email address could be found.</string>-->
<string name="message_compose_downloading_attachments_toast">Algunos adjuntos no se han descargado. Serán descargados automáticamente antes de que se envíe el mensaje</string>
<string name="message_compose_attachments_skipped_toast">Algunos adjuntos no pueden reenviarse porque no han sido descargados.</string>
<!-- NEW: <string name="message_compose_show_quoted_text_action">Quote message</string>-->
<string name="message_view_from_format">Desde: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
<string name="message_to_label">Para:</string>
@ -287,7 +287,6 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="message_view_fetching_attachment_toast">Obteniendo adjuntos.</string>
<string name="message_view_no_viewer">Imposible encontrar visualizador para <xliff:g id="mimetype">%s</xliff:g>.</string>
<string name="message_view_download_remainder">Descargar mensaje completo</string>
<!-- NOTE: The following message refers to strings with id 'account_setup_incoming_save_all_headers_label' and 'account_setup_incoming_title' -->
@ -314,7 +313,6 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="about_header">Sobre <xliff:g id="app_name">%s</xliff:g></string>
<string name="about_version">Versión: <xliff:g id="version">%s</xliff:g></string>
<string name="global_settings_flag_label">Ver estrellas</string>
<string name="global_settings_flag_summary">Las estrellas indican un mensaje destacado</string>
<string name="global_settings_checkbox_label">Selección múltiple</string>
@ -334,6 +332,8 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="global_settings_messageview_fixedwidth_summary">Utilizar tamaño fijo de fuente cuando se muestre mensajes en texto plano</string>
<string name="global_settings_messageview_return_to_list_label">Volver a la lista después de borrar</string>
<string name="global_settings_messageview_return_to_list_summary">Volver a la lista después de la acción de borrado</string>
<!-- NEW: <string name="global_settings_messageview_show_next_label">Show next message after delete</string>-->
<!-- NEW: <string name="global_settings_messageview_show_next_summary">Show next message by default after message deletion</string>-->
<string name="global_settings_confirm_actions_title">Confirmar acción</string>
<string name="global_settings_confirm_actions_summary">Mostrar un diálogo cuando se realice una de estas acciones</string>
@ -346,13 +346,11 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="global_settings_privacy_mode_title">Bloquear notificaciones</string>
<string name="global_settings_privacy_mode_summary">No mostrar asunto del mensaje en la barra de notificaciones cuando el sistema está bloqueado.</string>
<string name="quiet_time">Tiempo de Silencio</string>
<string name="quiet_time_description">Desactivar sonidos, alertas y luces por la noche</string>
<string name="quiet_time_starts">Silencio comienza</string>
<string name="quiet_time_ends">Silencio termina</string>
<string name="account_setup_basics_title">Configurar nueva cuenta</string>
<string name="account_setup_basics_instructions">Introduzca dirección de correo</string>
<string name="account_setup_basics_instructions2_fmt">(Debe Añadir <xliff:g id="number_accounts">%d</xliff:g> más cuentas.)</string>
@ -516,7 +514,6 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="account_setup_options_mail_display_count_1000">1000 mensajes</string>
<string name="account_setup_options_mail_display_count_all">Todos los mensajes</string>
<string name="move_copy_cannot_copy_unsynced_message">No se puede copiar/mover un mensaje que no ha sido sincronizado con el servidor</string>
<string name="account_setup_failed_dlg_title">No se ha podido finalizar la Configuración</string>
@ -560,6 +557,9 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="account_settings_composition">Configuración Saliente</string>
<!-- NEW: <string name="account_settings_default_quoted_text_shown_label">Quote original message when replying</string>-->
<!-- NEW: <string name="account_settings_default_quoted_text_shown_summary">When replying to messages, the original message is in your reply.</string>-->
<string name="account_settings_reply_after_quote_label">Respuesta tras cita</string>
<string name="account_settings_reply_after_quote_summary">Cuando se responda a un correo, el texto original estará por encima de su respuesta</string>
@ -567,6 +567,9 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="account_settings_message_format_text">Texto plano (se quitan las imágenes y el formato)</string>
<string name="account_settings_message_format_html">HTML (se mantienen las imágenes y el formato)</string>
<!-- NEW: <string name="account_settings_message_read_receipt_label">Read receipt</string>-->
<!-- NEW: <string name="account_settings_message_read_receipt_summary">Always request a read receipt</string>-->
<string name="account_settings_quote_style_label">Estilo de cita al responder</string>
<string name="account_settings_quote_style_prefix">Prefijo (como Gmail, Pine)</string>
<string name="account_settings_quote_style_header">Cabecera (como Outlook, Yahoo!, Hotmail)</string>
@ -590,7 +593,6 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="account_settings_storage_title">Almacenamiento</string>
<string name="account_settings_color_label">Color de la cuenta</string>
<string name="account_settings_color_summary">Seleccione el color a utilizar en la carpeta y en la cuenta</string>
@ -612,6 +614,8 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="account_settings_autodownload_message_size_512">512Kb</string>
<string name="account_settings_autodownload_message_size_1024">1Mb</string>
<string name="account_settings_autodownload_message_size_2048">2Mb</string>
<string name="account_settings_autodownload_message_size_5120">5Mb</string>
<string name="account_settings_autodownload_message_size_10240">10Mb</string>
<string name="account_settings_autodownload_message_size_any">cualquier tamaño (sin límite)</string>
<string name="account_settings_message_age_label">Sincronizar desde</string>
@ -628,7 +632,6 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="account_settings_message_age_6_months">los últimos 6 meses</string>
<string name="account_settings_message_age_1_year">el último año</string>
<string name="account_settings_folder_display_mode_label">Carpetas a mostrar</string>
<string name="account_settings_folder_display_mode_all">Todas</string>
<string name="account_settings_folder_display_mode_first_class">Sólo 1a clase</string>
@ -703,7 +706,6 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="account_settings_led_label">Parpadeo LED</string>
<string name="account_settings_led_summary">Parpadear el LED cuando llega nuevo correo</string>
<string name="account_settings_servers">Configurar Servidor</string>
<string name="account_settings_composition_title">Opciones de edición de mensaje</string>
@ -751,7 +753,6 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="choose_account_title">Seleccionar cuenta/identidad</string>
<string name="send_as">Enviar como</string>
<string name="no_identities">Ir a Configuración cuentas -&gt; y a identidad para crear una nueva identidad</string>
<string name="no_removable_identity">No puedes eliminar tu única identidad</string>
<string name="identity_has_no_email">No puedes utilizar una identidad sin dirección de correo</string>
@ -791,8 +792,11 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="provider_note_live">Sólo algunas cuentas \"Plus\" pueden utilizar acceso POP
Si no puede acceder con su contraseña y usuario y no tiene una cuenta de pago.
Es posible que pueda acceder sólo via web.</string>
<string name="provider_note_yahoojp">Si quiere utilizar el correo POP3 para este proveedor debe activar este acceso en la Configuración de yahoo.</string>
<!-- NEW: <string name="provider_note_naver">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Naver mail settings page.</string>-->
<!-- NEW: <string name="provider_note_hanmail">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Hanmail(Daum) mail settings page.</string>-->
<!-- NEW: <string name="provider_note_paran">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Paran mail settings page.</string>-->
<!-- NEW: <string name="provider_note_nate">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Nate mail settings page.</string>-->
<string name="account_setup_failed_dlg_invalid_certificate_title">Certificado desconocido</string>
<string name="account_setup_failed_dlg_invalid_certificate_accept">Aceptar certificado</string>
@ -821,8 +825,6 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="folder_list_display_mode_first_and_second_class">Ver carpetas de 1a y 2a Clase</string>
<string name="folder_list_display_mode_not_second_class">Ver todas excepto las de 2a Clase</string>
<string name="account_settings_signature__location_label">Posición de la Frima</string>
<string name="account_settings_signature__location_before_quoted_text">Antes del texto citado</string>
<string name="account_settings_signature__location_after_quoted_text">Después del texto citado</string>
@ -845,8 +847,6 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<string name="settings_messageview_zoom_controls_label">Controles del Zoom por sistema</string>
<string name="settings_messageview_zoom_controls_summary">Permitir opciones de zoom que soporta el propio dispositivo</string>
<string name="setting_language_system">Configurado en el sistema</string>
<string name="background_ops_label">Sincronizar en segundo plano</string>
@ -1051,4 +1051,8 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa
<!-- NEW: <string name="settings_attachment_default_path">Save attachments to...</string>-->
<!-- NEW: <string name="attachment_save_title">Save attachment</string>-->
<!-- NEW: <string name="attachment_save_desc">No file browser found. Where would you like to save this attachment?</string>-->
<!-- NEW: <string name="manage_accounts_move_up_action">Move up</string>-->
<!-- NEW: <string name="manage_accounts_move_down_action">Move down</string>-->
</resources>

40
res/values-fi/strings.xml
View File

@ -83,8 +83,6 @@
<string name="remove_account_action">Poista tili</string>
<string name="clear_pending_action">Tyhjennä odottavat toimenpiteet (vaara!)</string>
<string name="accounts_action">Tilit</string>
<string name="back_to_accounts_action">◀</string>
<string name="back_to_folder_list_action">◀</string>
@ -110,6 +108,9 @@
<string name="view_hide_details_action">Näytä/piilota lisätiedot</string>
<string name="add_cc_bcc_action">Lisää Kopio/Piilokopio</string>
<string name="edit_subject_action">Muokkaa aihetta</string>
<!-- NEW: <string name="read_receipt">Read receipt</string>-->
<!-- NEW: <string name="read_receipt_enabled">Read receipt will be requested</string>-->
<!-- NEW: <string name="read_receipt_disabled">Read receipt will not be requested</string>-->
<string name="add_attachment_action">Lisää liite</string>
<string name="add_attachment_action_image">Lisää liite (kuva)</string>
<string name="add_attachment_action_video">Lisää liite (video)</string>
@ -264,8 +265,7 @@ Tervetuloa K-9 Mail asennukseen.  K-9 on avoimen lähdekoodin sähköpostiasiak
<!-- NEW: <string name="error_contact_address_not_found">No email address could be found.</string>-->
<string name="message_compose_downloading_attachments_toast">Kaikkia liitteitä ei ladattu. Ne ladataan automaattisest ennen tämän viestin lähettämistä.</string>
<string name="message_compose_attachments_skipped_toast">Joitakin liitteitä ei voida jatkolähettää, koska niitä ei ole ladattu.</string>
<!-- NEW: <string name="message_compose_show_quoted_text_action">Quote message</string>-->
<string name="message_view_from_format">Lähettäjä: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
<string name="message_to_label">Vast.ottaja:</string>
@ -285,7 +285,6 @@ Tervetuloa K-9 Mail asennukseen.  K-9 on avoimen lähdekoodin sähköpostiasiak
<string name="message_view_fetching_attachment_toast">Haetaan liitettä.</string>
<string name="message_view_no_viewer">Ei löydy katseluohjelmaa tyypille <xliff:g id="mimetype">%s</xliff:g>.</string>
<string name="message_view_download_remainder">Lataa koko viesti</string>
<!-- NOTE: The following message refers to strings with id 'account_setup_incoming_save_all_headers_label' and 'account_setup_incoming_title' -->
@ -312,7 +311,6 @@ Tervetuloa K-9 Mail asennukseen.  K-9 on avoimen lähdekoodin sähköpostiasiak
<string name="about_header">Tietoja <xliff:g id="app_name">%s</xliff:g></string>
<string name="about_version">Versio: <xliff:g id="version">%s</xliff:g></string>
<string name="global_settings_flag_label">Viestin tähdet</string>
<string name="global_settings_flag_summary">Tähdet ilmaisevat merkityt viestit</string>
<string name="global_settings_checkbox_label">Usean valinnan valintaruudut</string>
@ -332,6 +330,8 @@ Tervetuloa K-9 Mail asennukseen.  K-9 on avoimen lähdekoodin sähköpostiasiak
<string name="global_settings_messageview_fixedwidth_summary">Käytä kiinteää kirjasinleveyttä muotoilemattomille viesteille</string>
<string name="global_settings_messageview_return_to_list_label">Palaa poiston jälkeen listanäkymään</string>
<string name="global_settings_messageview_return_to_list_summary">Palaa viestilistaan viestin poiston jälkeen</string>
<!-- NEW: <string name="global_settings_messageview_show_next_label">Show next message after delete</string>-->
<!-- NEW: <string name="global_settings_messageview_show_next_summary">Show next message by default after message deletion</string>-->
<string name="global_settings_confirm_actions_title">Vahvista toimenpiteet</string>
<string name="global_settings_confirm_actions_summary">Näytä keskusteluikkuna valitun toimenpiteen suorituksesta</string>
@ -344,13 +344,11 @@ Tervetuloa K-9 Mail asennukseen.  K-9 on avoimen lähdekoodin sähköpostiasiak
<string name="global_settings_privacy_mode_title">Lukitusnäytön ilmoitukset</string>
<string name="global_settings_privacy_mode_summary">Älä näytä viestin aihetta ilmoituspalkissa jos laite on lukittuna</string>
<string name="quiet_time">Hiljainen aika</string>
<string name="quiet_time_description">Poista käytöstä soittoäänen pirinä, pärinä ja vilkkuminen yöllä</string>
<string name="quiet_time_starts">Hiljainen aika alkaa</string>
<string name="quiet_time_ends">Hiljainen aika päättyy</string>
<string name="account_setup_basics_title">Lisää uusi tili</string>
<string name="account_setup_basics_instructions">Anna tilin sähköpostiosoite:</string>
<string name="account_setup_basics_instructions2_fmt">(Voit lisätä vielä <xliff:g id="number_accounts">%d</xliff:g> tiliä.)</string>
@ -512,7 +510,6 @@ Tervetuloa K-9 Mail asennukseen.  K-9 on avoimen lähdekoodin sähköpostiasiak
<string name="account_setup_options_mail_display_count_1000">1000 viestiä</string>
<string name="account_setup_options_mail_display_count_all">Kaikki viestit</string>
<string name="move_copy_cannot_copy_unsynced_message">Viestiä ei voi kopioida tai siirtää koska se ei ole synkronoitu palvelimelle</string>
<string name="account_setup_failed_dlg_title">Asennus ei onnistunut</string>
@ -556,6 +553,9 @@ Tervetuloa K-9 Mail asennukseen.  K-9 on avoimen lähdekoodin sähköpostiasiak
<string name="account_settings_composition">Lähetetään postia</string>
<!-- NEW: <string name="account_settings_default_quoted_text_shown_label">Quote original message when replying</string>-->
<!-- NEW: <string name="account_settings_default_quoted_text_shown_summary">When replying to messages, the original message is in your reply.</string>-->
<string name="account_settings_reply_after_quote_label">Vastaa lainauksen jälkeen</string>
<string name="account_settings_reply_after_quote_summary">Kun viestiin vastataan, alkuperäinen viesti on vastauksesi yläpuolella.</string>
@ -563,6 +563,9 @@ Tervetuloa K-9 Mail asennukseen.  K-9 on avoimen lähdekoodin sähköpostiasiak
<string name="account_settings_message_format_text">Pelkkä teksti (kuvat ja muotoilu on poistettu)</string>
<string name="account_settings_message_format_html">HTML (kuvat ja muotoilu säilytetään)</string>
<!-- NEW: <string name="account_settings_message_read_receipt_label">Read receipt</string>-->
<!-- NEW: <string name="account_settings_message_read_receipt_summary">Always request a read receipt</string>-->
<string name="account_settings_quote_style_label">Vastaa lainaamalla tyyli</string>
<string name="account_settings_quote_style_prefix">Etuliite (kuten Gmail, Pine)</string>
<string name="account_settings_quote_style_header">Otsikko (kuten Outlook, Yahoo!, Hotmail)</string>
@ -586,7 +589,6 @@ Tervetuloa K-9 Mail asennukseen.  K-9 on avoimen lähdekoodin sähköpostiasiak
<string name="account_settings_storage_title">Tallennus</string>
<string name="account_settings_color_label">Tilin väri</string>
<string name="account_settings_color_summary">Valitse väri tilin kansio- ja tililistaukseen</string>
@ -608,6 +610,8 @@ Tervetuloa K-9 Mail asennukseen.  K-9 on avoimen lähdekoodin sähköpostiasiak
<string name="account_settings_autodownload_message_size_512">512 kt</string>
<string name="account_settings_autodownload_message_size_1024">1 Mt</string>
<string name="account_settings_autodownload_message_size_2048">2 Mt</string>
<string name="account_settings_autodownload_message_size_5120">5 Mt</string>
<string name="account_settings_autodownload_message_size_10240">10 Mt</string>
<string name="account_settings_autodownload_message_size_any">mikä tahansa (ei rajoitusta)</string>
<string name="account_settings_message_age_label">Synkronoi viestit</string>
@ -624,7 +628,6 @@ Tervetuloa K-9 Mail asennukseen.  K-9 on avoimen lähdekoodin sähköpostiasiak
<string name="account_settings_message_age_6_months">viimeiset 6 kuukautta</string>
<string name="account_settings_message_age_1_year">viime vuonna</string>
<string name="account_settings_folder_display_mode_label">Näytä kansiot</string>
<string name="account_settings_folder_display_mode_all">Kaikki</string>
<string name="account_settings_folder_display_mode_first_class">Vain 1. luokan kansiot</string>
@ -699,7 +702,6 @@ Tervetuloa K-9 Mail asennukseen.  K-9 on avoimen lähdekoodin sähköpostiasiak
<string name="account_settings_led_label">Merkkivalo vilkkuu</string>
<string name="account_settings_led_summary">Viestin saapuessa merkkivalo vilkkuu</string>
<string name="account_settings_servers">Palvelimen asetukset</string>
<string name="account_settings_composition_title">Viestin kirjoituksen asetukset</string>
@ -747,7 +749,6 @@ Tervetuloa K-9 Mail asennukseen.  K-9 on avoimen lähdekoodin sähköpostiasiak
<string name="choose_account_title">Valitse tili/identiteetti</string>
<string name="send_as">Lähetä</string>
<string name="no_identities">Mene tilin asetuksiin -> Hallitse identiteettejä luodaksesi identiteetin</string>
<string name="no_removable_identity">Et voi poistaa ainoaa identiteettiäsi</string>
<string name="identity_has_no_email">Identiteettiä ei voi käyttää ilman sähköpostiosoitetta</string>
@ -788,8 +789,11 @@ Tervetuloa K-9 Mail asennukseen.  K-9 on avoimen lähdekoodin sähköpostiasiak
      joka sallii tämän ohjelman ottaa yhteyden. Jos et voi kirjautua
      oikealla sähköpostiosoitteella ja salasanalla, sinulla ei voi olla maksullista
      \"Plus\"-tiliä. Ole hyvä ja käytä www-selainta käyttääksesi niihin sähköpostitileihin.</string>
<string name="provider_note_yahoojp">Jos haluat käyttää tämän palveluntarjoajan POP3:a, sinun tulee sallia käyttää POP3 Yahoon sähköpostin asetukset-sivulla.</string>
<!-- NEW: <string name="provider_note_naver">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Naver mail settings page.</string>-->
<!-- NEW: <string name="provider_note_hanmail">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Hanmail(Daum) mail settings page.</string>-->
<!-- NEW: <string name="provider_note_paran">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Paran mail settings page.</string>-->
<!-- NEW: <string name="provider_note_nate">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Nate mail settings page.</string>-->
<string name="account_setup_failed_dlg_invalid_certificate_title">Tunnistamaton sertifikaatti</string>
<string name="account_setup_failed_dlg_invalid_certificate_accept">Hyväksy-avain</string>
@ -818,8 +822,6 @@ Tervetuloa K-9 Mail asennukseen.  K-9 on avoimen lähdekoodin sähköpostiasiak
<string name="folder_list_display_mode_first_and_second_class">Näytä 1. ja 2. luokan kansiot</string>
<string name="folder_list_display_mode_not_second_class">Näytä kaikki paitsi 2. luokan kansiot</string>
<string name="account_settings_signature__location_label">Allekirjoituksen sijainti</string>
<string name="account_settings_signature__location_before_quoted_text">Ennen lainattua viestiä</string>
<string name="account_settings_signature__location_after_quoted_text">Lainatun viestin jälkeen</string>
@ -842,8 +844,6 @@ Tervetuloa K-9 Mail asennukseen.  K-9 on avoimen lähdekoodin sähköpostiasiak
<string name="settings_messageview_zoom_controls_label">Järjestelmän zoomin ohjaus</string>
<string name="settings_messageview_zoom_controls_summary">Ota widgetin zoomaus tai nipistys-zoomaus, jos laite tukee</string>
<string name="setting_language_system">Järjestelmän oletus</string>
<string name="background_ops_label">Synkronointi taustalla</string>
@ -1048,4 +1048,8 @@ Tervetuloa K-9 Mail asennukseen.  K-9 on avoimen lähdekoodin sähköpostiasiak
<!-- NEW: <string name="settings_attachment_default_path">Save attachments to...</string>-->
<!-- NEW: <string name="attachment_save_title">Save attachment</string>-->
<!-- NEW: <string name="attachment_save_desc">No file browser found. Where would you like to save this attachment?</string>-->
<!-- NEW: <string name="manage_accounts_move_up_action">Move up</string>-->
<!-- NEW: <string name="manage_accounts_move_down_action">Move down</string>-->
</resources>

40
res/values-gl/strings.xml
View File

@ -83,8 +83,6 @@
<string name="remove_account_action">Eliminar conta</string>
<string name="clear_pending_action">Limpar accións pendentes (perigroso!)</string>
<string name="accounts_action">Contas</string>
<string name="back_to_accounts_action">◀</string>
<string name="back_to_folder_list_action">◀</string>
@ -109,6 +107,9 @@
<string name="view_hide_details_action">Ver/Ocultar detalles</string>
<string name="add_cc_bcc_action">Engadir Cc/Bcc</string>
<string name="edit_subject_action">Editar Asunto</string>
<!-- NEW: <string name="read_receipt">Read receipt</string>-->
<!-- NEW: <string name="read_receipt_enabled">Read receipt will be requested</string>-->
<!-- NEW: <string name="read_receipt_disabled">Read receipt will not be requested</string>-->
<string name="add_attachment_action">Engadir adxunto</string>
<string name="add_attachment_action_image">Engadir adxunto (Imaxe)</string>
<string name="add_attachment_action_video">Engadir adxunto (Vídeo)</string>
@ -266,8 +267,7 @@ Benvido á Configuración de K-9. K-9 é un cliente de correo OpenSource para An
<string name="error_contact_address_not_found">Non atopo enderezo electrónico.</string>
<string name="message_compose_downloading_attachments_toast">Algúns adxuntos non se descargaron. Serán descargados automáticamente antes de que mandar a mensaxe</string>
<string name="message_compose_attachments_skipped_toast">Algúns adxuntos non poden reenviarse porque non foron descargados.</string>
<!-- NEW: <string name="message_compose_show_quoted_text_action">Quote message</string>-->
<string name="message_view_from_format">Dende: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
<string name="message_to_label">Para:</string>
@ -287,7 +287,6 @@ Benvido á Configuración de K-9. K-9 é un cliente de correo OpenSource para An
<string name="message_view_fetching_attachment_toast">Obtendo adxuntos.</string>
<string name="message_view_no_viewer">Imposible atopar visor para <xliff:g id="mimetype">%s</xliff:g>.</string>
<string name="message_view_download_remainder">Descargar mensaxe completa</string>
<!-- NOTE: The following message refers to strings with id 'account_setup_incoming_save_all_headers_label' and 'account_setup_incoming_title' -->
@ -314,7 +313,6 @@ Benvido á Configuración de K-9. K-9 é un cliente de correo OpenSource para An
<string name="about_header">Sobre <xliff:g id="app_name">%s</xliff:g></string>
<string name="about_version">Versión: <xliff:g id="version">%s</xliff:g></string>
<string name="global_settings_flag_label">Ver estrelas</string>
<string name="global_settings_flag_summary">As estrelas indican unha mensaxe destacada</string>
<string name="global_settings_checkbox_label">Selección múltiple</string>
@ -334,6 +332,8 @@ Benvido á Configuración de K-9. K-9 é un cliente de correo OpenSource para An
<string name="global_settings_messageview_fixedwidth_summary">Usar tamaño fixo de fonte nas mensaxes en texto plano</string>
<string name="global_settings_messageview_return_to_list_label">Voltar á lista despois de borrar</string>
<string name="global_settings_messageview_return_to_list_summary">Voltar á lista despois da acción de borrado</string>
<!-- NEW: <string name="global_settings_messageview_show_next_label">Show next message after delete</string>-->
<!-- NEW: <string name="global_settings_messageview_show_next_summary">Show next message by default after message deletion</string>-->
<string name="global_settings_confirm_actions_title">Confirmar acción</string>
<string name="global_settings_confirm_actions_summary">Amosar un diálogo cuando se realice una de estas acciones</string>
@ -346,13 +346,11 @@ Benvido á Configuración de K-9. K-9 é un cliente de correo OpenSource para An
<string name="global_settings_privacy_mode_title">Bloquear notificacións</string>
<string name="global_settings_privacy_mode_summary">Non amosar asunto da mensaxe na barra de notificacións cando o sistema está bloqueado.</string>
<string name="quiet_time">Tempo de Silencio</string>
<string name="quiet_time_description">Desactivar sons, alertas e luces pola noite</string>
<string name="quiet_time_starts">Silencio empeza</string>
<string name="quiet_time_ends">Silencio remata</string>
<string name="account_setup_basics_title">Configurar nova conta</string>
<string name="account_setup_basics_instructions">Introduzca enderezo de correo</string>
<string name="account_setup_basics_instructions2_fmt">(Debe Engadir <xliff:g id="number_accounts">%d</xliff:g> máis contas.)</string>
@ -516,7 +514,6 @@ Benvido á Configuración de K-9. K-9 é un cliente de correo OpenSource para An
<string name="account_setup_options_mail_display_count_1000">1000 mensaxes</string>
<string name="account_setup_options_mail_display_count_all">Todas as mensaxes</string>
<string name="move_copy_cannot_copy_unsynced_message">Non se pode copiar/mover unha mensaxe que non foi sincronizada co servidor</string>
<string name="account_setup_failed_dlg_title">No se puido rematar a Configuración</string>
@ -560,6 +557,9 @@ Benvido á Configuración de K-9. K-9 é un cliente de correo OpenSource para An
<string name="account_settings_composition">Configuración Saínte</string>
<!-- NEW: <string name="account_settings_default_quoted_text_shown_label">Quote original message when replying</string>-->
<!-- NEW: <string name="account_settings_default_quoted_text_shown_summary">When replying to messages, the original message is in your reply.</string>-->
<string name="account_settings_reply_after_quote_label">Resposta tras cita</string>
<string name="account_settings_reply_after_quote_summary">Cando se responda a un correo, o texto orixinal estará por riba da sua resposta</string>
@ -567,6 +567,9 @@ Benvido á Configuración de K-9. K-9 é un cliente de correo OpenSource para An
<string name="account_settings_message_format_text">Texto plano (borraránse imaxes e formato)</string>
<string name="account_settings_message_format_html">HTML (mantéñense imaxes e formato)</string>
<!-- NEW: <string name="account_settings_message_read_receipt_label">Read receipt</string>-->
<!-- NEW: <string name="account_settings_message_read_receipt_summary">Always request a read receipt</string>-->
<string name="account_settings_quote_style_label">Responder estilo comentario</string>
<string name="account_settings_quote_style_prefix">Prefixo (coma Gmail, Pine)</string>
<string name="account_settings_quote_style_header">Cabeceira (coma Outlook, Yahoo!, Hotmail)</string>
@ -590,7 +593,6 @@ Benvido á Configuración de K-9. K-9 é un cliente de correo OpenSource para An
<string name="account_settings_storage_title">Almacenamento</string>
<string name="account_settings_color_label">Cor da conta</string>
<string name="account_settings_color_summary">Elixe a cor a usar na carpeta e na conta</string>
@ -612,6 +614,8 @@ Benvido á Configuración de K-9. K-9 é un cliente de correo OpenSource para An
<string name="account_settings_autodownload_message_size_512">512Kb</string>
<string name="account_settings_autodownload_message_size_1024">1Mb</string>
<string name="account_settings_autodownload_message_size_2048">2Mb</string>
<string name="account_settings_autodownload_message_size_5120">5Mb</string>
<string name="account_settings_autodownload_message_size_10240">10Mb</string>
<string name="account_settings_autodownload_message_size_any">calquera tamaño (sen límite)</string>
<string name="account_settings_message_age_label">Sincronizar dende</string>
@ -628,7 +632,6 @@ Benvido á Configuración de K-9. K-9 é un cliente de correo OpenSource para An
<string name="account_settings_message_age_6_months">os últimos 6 meses</string>
<string name="account_settings_message_age_1_year">o último ano</string>
<string name="account_settings_folder_display_mode_label">Carpetas a amosar</string>
<string name="account_settings_folder_display_mode_all">Todas</string>
<string name="account_settings_folder_display_mode_first_class">Só 1a clase</string>
@ -703,7 +706,6 @@ Benvido á Configuración de K-9. K-9 é un cliente de correo OpenSource para An
<string name="account_settings_led_label">Pestanexo LED</string>
<string name="account_settings_led_summary">Pestanexar o LED cando chega novo correo</string>
<string name="account_settings_servers">Configurar Servidor</string>
<string name="account_settings_composition_title">Opcións de edición de mensaxe</string>
@ -751,7 +753,6 @@ Benvido á Configuración de K-9. K-9 é un cliente de correo OpenSource para An
<string name="choose_account_title">Seleccionar conta/identidade</string>
<string name="send_as">Enviar como</string>
<string name="no_identities">Ir a Configuración contas -&gt; e a identidade para crear unha nova identidade</string>
<string name="no_removable_identity">Non podes eliminar a túa única identidade</string>
<string name="identity_has_no_email">Non podes usar unha identidade sen enderezo de correo</string>
@ -791,8 +792,11 @@ Benvido á Configuración de K-9. K-9 é un cliente de correo OpenSource para An
<string name="provider_note_live">Só algunhas contas \"Plus\" poden usar acceso POP
Se non podes acceder coa tua contrasinal e usuario e non tes unha conta de pago.
É posible que podas acceder só vía web.</string>
<string name="provider_note_yahoojp">Se queres usar o correo POP3 para este proveedor debes activar este acceso na Configuración de Yahoo.</string>
<!-- NEW: <string name="provider_note_naver">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Naver mail settings page.</string>-->
<!-- NEW: <string name="provider_note_hanmail">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Hanmail(Daum) mail settings page.</string>-->
<!-- NEW: <string name="provider_note_paran">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Paran mail settings page.</string>-->
<!-- NEW: <string name="provider_note_nate">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Nate mail settings page.</string>-->
<string name="account_setup_failed_dlg_invalid_certificate_title">Certificado descoñecido</string>
<string name="account_setup_failed_dlg_invalid_certificate_accept">Aceptar certificado</string>
@ -821,8 +825,6 @@ Benvido á Configuración de K-9. K-9 é un cliente de correo OpenSource para An
<string name="folder_list_display_mode_first_and_second_class">Ver carpetas de 1a e 2a Clase</string>
<string name="folder_list_display_mode_not_second_class">Ver todas agás as de 2a Clase</string>
<string name="account_settings_signature__location_label">Posición da sinatura</string>
<string name="account_settings_signature__location_before_quoted_text">Antes do texto citado</string>
<string name="account_settings_signature__location_after_quoted_text">Despois do texto citado</string>
@ -845,8 +847,6 @@ Benvido á Configuración de K-9. K-9 é un cliente de correo OpenSource para An
<string name="settings_messageview_zoom_controls_label">Controles do Zoom por sistema</string>
<string name="settings_messageview_zoom_controls_summary">Permitir opcións de zoom que soporta o propio dispositivo</string>
<string name="setting_language_system">Configurado no sistema</string>
<string name="background_ops_label">Sincronizar en segundo plano</string>
@ -1052,4 +1052,8 @@ Benvido á Configuración de K-9. K-9 é un cliente de correo OpenSource para An
<!-- NEW: <string name="settings_attachment_default_path">Save attachments to...</string>-->
<!-- NEW: <string name="attachment_save_title">Save attachment</string>-->
<!-- NEW: <string name="attachment_save_desc">No file browser found. Where would you like to save this attachment?</string>-->
<!-- NEW: <string name="manage_accounts_move_up_action">Move up</string>-->
<!-- NEW: <string name="manage_accounts_move_down_action">Move down</string>-->
</resources>

34
res/values-it/strings.xml
View File

@ -83,8 +83,6 @@
<string name="remove_account_action">Rimuovi account</string>
<string name="clear_pending_action">Annulla tutte le azioni in corso (pericolo!)</string>
<string name="accounts_action">Account</string>
<string name="back_to_accounts_action">◀</string>
<string name="back_to_folder_list_action">◀</string>
@ -271,8 +269,7 @@ Benvenuto nella configurazione della posta di K-9. K-9 è un client di posta ope
<!-- NEW: <string name="error_contact_address_not_found">No email address could be found.</string>-->
<string name="message_compose_downloading_attachments_toast">Alcuni allegati non sono stati scaricati. Verranno scaricati automaticamente prima che questo messaggio venga inviato.</string>
<string name="message_compose_attachments_skipped_toast">Alcuni allegati non possono essere inoltrati in quanto non sono stati scaricati.</string>
<!-- NEW: <string name="message_compose_show_quoted_text_action">Quote message</string>-->
<string name="message_view_from_format">Da: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
<string name="message_to_label">A:</string>
@ -292,7 +289,6 @@ Benvenuto nella configurazione della posta di K-9. K-9 è un client di posta ope
<string name="message_view_fetching_attachment_toast">Recupero allegato in corso.</string>
<string name="message_view_no_viewer">Impossibile trovare un visualizzatore per <xliff:g id="mimetype">%s</xliff:g>.</string>
<string name="message_view_download_remainder">Scarica intero messaggio</string>
<!-- NOTE: The following message refers to strings with id 'account_setup_incoming_save_all_headers_label' and 'account_setup_incoming_title' -->
@ -319,7 +315,6 @@ Benvenuto nella configurazione della posta di K-9. K-9 è un client di posta ope
<string name="about_header">Informazioni su <xliff:g id="app_name">%s</xliff:g></string>
<string name="about_version">Versione: <xliff:g id="version">%s</xliff:g></string>
<string name="global_settings_flag_label">Mostra stelle</string>
<string name="global_settings_flag_summary">Le stelle indicano i messaggi evidenziati</string>
<string name="global_settings_checkbox_label">Caselle di selezione multipla</string>
@ -339,6 +334,8 @@ Benvenuto nella configurazione della posta di K-9. K-9 è un client di posta ope
<string name="global_settings_messageview_fixedwidth_summary">Usa font a larghezza fissa quando mostri i messaggi di testo</string>
<string name="global_settings_messageview_return_to_list_label">Torna all\'elenco dopo l\'eliminazione</string>
<string name="global_settings_messageview_return_to_list_summary">Ritorna all\'elenco dei messaggi dopo l\'eliminazione del messaggio</string>
<!-- NEW: <string name="global_settings_messageview_show_next_label">Show next message after delete</string>-->
<!-- NEW: <string name="global_settings_messageview_show_next_summary">Show next message by default after message deletion</string>-->
<string name="global_settings_confirm_actions_title">Conferma azioni</string>
<string name="global_settings_confirm_actions_summary">Mostra una finestra di dialogo ogni volta che si eseguono le azioni selezionate</string>
@ -351,13 +348,11 @@ Benvenuto nella configurazione della posta di K-9. K-9 è un client di posta ope
<string name="global_settings_privacy_mode_title">Notifiche con blocco dello schermo</string>
<string name="global_settings_privacy_mode_summary">Non visualizzare l\'oggetto del messaggio nella barra di notifica quando il sistema è bloccato</string>
<string name="quiet_time">Silenzioso a tempo</string>
<string name="quiet_time_description">Disabilita chiamata, vibrazione e lampeggi di notte</string>
<string name="quiet_time_starts">Attiva alle</string>
<string name="quiet_time_ends">Disattiva alle</string>
<string name="account_setup_basics_title">Configura un nuovo account</string>
<string name="account_setup_basics_instructions">Inserisci l\'indirizzo e-mail di questo account:</string>
<string name="account_setup_basics_instructions2_fmt">(Puoi aggiungere altri <xliff:g id="number_accounts">%d</xliff:g> account)</string>
@ -521,7 +516,6 @@ Benvenuto nella configurazione della posta di K-9. K-9 è un client di posta ope
<string name="account_setup_options_mail_display_count_1000">1000 messaggi</string>
<string name="account_setup_options_mail_display_count_all">tutti i messaggi</string>
<string name="move_copy_cannot_copy_unsynced_message">Non è possibile copiare o spostare un messaggio che non sia sincronizzato con il server</string>
<string name="account_setup_failed_dlg_title">Impossibile completare la configurazione</string>
@ -565,6 +559,9 @@ Benvenuto nella configurazione della posta di K-9. K-9 è un client di posta ope
<string name="account_settings_composition">Composizione messaggio</string>
<!-- NEW: <string name="account_settings_default_quoted_text_shown_label">Quote original message when replying</string>-->
<!-- NEW: <string name="account_settings_default_quoted_text_shown_summary">When replying to messages, the original message is in your reply.</string>-->
<string name="account_settings_reply_after_quote_label">Risposta dopo testo quotato</string>
<string name="account_settings_reply_after_quote_summary">Quando si risponde ai messaggi, il messaggio originale viene visualizzato sopra la tua risposta.</string>
@ -598,7 +595,6 @@ Benvenuto nella configurazione della posta di K-9. K-9 è un client di posta ope
<string name="account_settings_storage_title">Memorizzazione</string>
<string name="account_settings_color_label">Colore dell\'account</string>
<string name="account_settings_color_summary">Scegli il colore dell\'account utilizzato nell\'elenco delle cartelle e degli account</string>
@ -620,6 +616,8 @@ Benvenuto nella configurazione della posta di K-9. K-9 è un client di posta ope
<string name="account_settings_autodownload_message_size_512">512KB</string>
<string name="account_settings_autodownload_message_size_1024">1MB</string>
<string name="account_settings_autodownload_message_size_2048">2MB</string>
<string name="account_settings_autodownload_message_size_5120">5MB</string>
<string name="account_settings_autodownload_message_size_10240">10MB</string>
<string name="account_settings_autodownload_message_size_any">qualsiasi dimensione (nessun limite)</string>
<string name="account_settings_message_age_label">Sincronizza messaggi da</string>
@ -636,7 +634,6 @@ Benvenuto nella configurazione della posta di K-9. K-9 è un client di posta ope
<string name="account_settings_message_age_6_months">gli ultimi 6 mesi</string>
<string name="account_settings_message_age_1_year">l\'ultimo anno</string>
<string name="account_settings_folder_display_mode_label">Visualizza cartelle</string>
<string name="account_settings_folder_display_mode_all">Tutte</string>
<string name="account_settings_folder_display_mode_first_class">Soltanto cartelle di 1a Classe</string>
@ -711,7 +708,6 @@ Benvenuto nella configurazione della posta di K-9. K-9 è un client di posta ope
<string name="account_settings_led_label">LED lampeggiante</string>
<string name="account_settings_led_summary">LED lampeggiante quando arriva un messaggio</string>
<string name="account_settings_servers">Impostazioni del server</string>
<string name="account_settings_composition_title">Opzioni composizione messaggi</string>
@ -759,7 +755,6 @@ Benvenuto nella configurazione della posta di K-9. K-9 è un client di posta ope
<string name="choose_account_title">Scegli account/identità</string>
<string name="send_as">Invia come</string>
<string name="no_identities">Vai a Impostazioni account -&gt; Gestione identità per creare identità</string>
<string name="no_removable_identity">Non è possibile rimuovere la propria unica identità</string>
<string name="identity_has_no_email">Non è possibile utilizzare una identità senza un indirizzo e-mail</string>
@ -801,8 +796,11 @@ Benvenuto nella configurazione della posta di K-9. K-9 è un client di posta ope
indirizzo email e password corretti, è possibile che non sia stato pagato un account
\"Plus\". Esegui il browser Internet per acquistare l\'accesso a questo
genere di account e-mail.</string>
<string name="provider_note_yahoojp">Se si desidera utilizzare POP3 per questo provider, si deve consentire l\'utilizzo di POP3 sulla pagina delle impostazioni di Yahoo.</string>
<!-- NEW: <string name="provider_note_naver">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Naver mail settings page.</string>-->
<!-- NEW: <string name="provider_note_hanmail">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Hanmail(Daum) mail settings page.</string>-->
<!-- NEW: <string name="provider_note_paran">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Paran mail settings page.</string>-->
<!-- NEW: <string name="provider_note_nate">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Nate mail settings page.</string>-->
<string name="account_setup_failed_dlg_invalid_certificate_title">Certificato non riconosciuto</string>
<string name="account_setup_failed_dlg_invalid_certificate_accept">Accetta chiave</string>
@ -831,8 +829,6 @@ Benvenuto nella configurazione della posta di K-9. K-9 è un client di posta ope
<string name="folder_list_display_mode_first_and_second_class">Visualizza cartelle di 1a e 2a Classe</string>
<string name="folder_list_display_mode_not_second_class">Visualizza tutte eccetto le cartelle di 2a Classe</string>
<string name="account_settings_signature__location_label">Posizione della firma</string>
<string name="account_settings_signature__location_before_quoted_text">Prima del testo quotato</string>
<string name="account_settings_signature__location_after_quoted_text">Dopo il testo quotato</string>
@ -855,8 +851,6 @@ Benvenuto nella configurazione della posta di K-9. K-9 è un client di posta ope
<string name="settings_messageview_zoom_controls_label">Zoom di sistema</string>
<string name="settings_messageview_zoom_controls_summary">Abilita widgets dello zoom o pinch-zoom se il dispositivo lo supporta</string>
<string name="setting_language_system">Impostazioni predefinite di sistema</string>
<string name="background_ops_label">Sincronizzazione in background</string>
@ -1061,4 +1055,8 @@ Benvenuto nella configurazione della posta di K-9. K-9 è un client di posta ope
<!-- NEW: <string name="settings_attachment_default_path">Save attachments to...</string>-->
<!-- NEW: <string name="attachment_save_title">Save attachment</string>-->
<!-- NEW: <string name="attachment_save_desc">No file browser found. Where would you like to save this attachment?</string>-->
<!-- NEW: <string name="manage_accounts_move_up_action">Move up</string>-->
<!-- NEW: <string name="manage_accounts_move_down_action">Move down</string>-->
</resources>

23
res/values-ja/strings.xml
View File

@ -83,8 +83,6 @@
<string name="remove_account_action">アカウント削除</string>
<string name="clear_pending_action">保留中のアクションをクリア (危険！)</string>
<string name="accounts_action">アカウント一覧</string>
<string name="back_to_accounts_action">\u25c0</string>
<string name="back_to_folder_list_action">\u25c0</string>
@ -272,8 +270,6 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
<string name="message_compose_attachments_skipped_toast">ダウンロードしていないため、一部の添付ファイルを転送することはできません。</string>
<string name="message_compose_show_quoted_text_action">元のメッセージを引用する</string>
<string name="message_view_from_format">送信者: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
<string name="message_to_label">宛先:</string>
<string name="message_view_cc_label">Cc:</string>
@ -318,7 +314,6 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
<string name="about_header"><xliff:g id="app_name">%s</xliff:g> について</string>
<string name="about_version">バージョン: <xliff:g id="version">%s</xliff:g></string>
<string name="global_settings_flag_label">スターを表示</string>
<string name="global_settings_flag_summary">スターは印の付いたメッセージを示す</string>
<string name="global_settings_checkbox_label">複数選択チェックボックス</string>
@ -336,8 +331,10 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
<string name="global_settings_messageview_fixedwidth_label">固定幅フォント</string>
<string name="global_settings_messageview_fixedwidth_summary">プレーンテキストメッセージの表示に固定幅フォントを利用</string>
<string name="global_settings_messageview_return_to_list_label">削除後メッセージ一覧へ戻る</string>
<string name="global_settings_messageview_return_to_list_label">削除後メッセージ一覧に戻る</string>
<string name="global_settings_messageview_return_to_list_summary">メッセージの削除後、メッセージ一覧に戻る</string>
<string name="global_settings_messageview_show_next_label">削除後次のメッセージを表示</string>
<string name="global_settings_messageview_show_next_summary">メッセージの削除後、次のメッセージを表示する</string>
<string name="global_settings_confirm_actions_title">確認</string>
<string name="global_settings_confirm_actions_summary">選択した動作を実行するときに常にダイアログを表示する</string>
@ -350,13 +347,11 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
<string name="global_settings_privacy_mode_title">スクリーンロック時の通知</string>
<string name="global_settings_privacy_mode_summary">システムがロックされているときは通知バーにメッセージの表題を表示しない</string>
<string name="quiet_time">夜間時間帯</string>
<string name="quiet_time_description">夜間での各種通知や表示を抑制する時間帯を設定</string>
<string name="quiet_time_starts">開始時刻</string>
<string name="quiet_time_ends">終了時刻</string>
<string name="account_setup_basics_title">電子メールセットアップ</string>
<string name="account_setup_basics_instructions">このアカウントで使用するメールアドレスを入力して下さい</string>
<string name="account_setup_basics_instructions2_fmt">(追加する場合は <xliff:g id="number_accounts">%d</xliff:g> と異なるメールアドレスを入力して下さい)</string>
@ -599,7 +594,6 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
<string name="account_settings_storage_title">ストレージ</string>
<string name="account_settings_color_label">アカウントの色</string>
<string name="account_settings_color_summary">アカウント一覧とフォルダで使用する色を選択</string>
@ -639,7 +633,6 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
<string name="account_settings_message_age_6_months">６ヶ月前</string>
<string name="account_settings_message_age_1_year">１年前</string>
<string name="account_settings_folder_display_mode_label">表示するフォルダ</string>
<string name="account_settings_folder_display_mode_all">すべて</string>
<string name="account_settings_folder_display_mode_first_class">1st クラスフォルダのみ</string>
@ -714,7 +707,6 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
<string name="account_settings_led_label">LEDを点滅</string>
<string name="account_settings_led_summary">メール着信時にLEDを点滅</string>
<string name="account_settings_servers">サーバ設定</string>
<string name="account_settings_composition_title">メール本文構成管理</string>
@ -762,7 +754,6 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
<string name="choose_account_title">アカウント選択</string>
<string name="send_as">他のアカウントで送信</string>
<string name="no_identities">アカウント設定 -&gt; 差出人情報管理 で差出人情報を作成してください</string>
<string name="no_removable_identity">最後の差出人情報は削除できません</string>
<string name="identity_has_no_email">メールアドレスの無い差出人情報は選択できません</string>
@ -829,8 +820,6 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
<string name="folder_list_display_mode_first_and_second_class">1st と 2nd クラスフォルダ表示</string>
<string name="folder_list_display_mode_not_second_class">2nd クラスフォルダを除くすべて表示</string>
<string name="account_settings_signature__location_label">署名挿入場所</string>
<string name="account_settings_signature__location_before_quoted_text">引用テキストの前に挿入</string>
<string name="account_settings_signature__location_after_quoted_text">引用テキストの後に挿入</string>
@ -853,8 +842,6 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
<string name="settings_messageview_zoom_controls_label">ズーム制御</string>
<string name="settings_messageview_zoom_controls_summary">デバイスが対応するならば、ズームウィジェットやピンチズームを有効にする</string>
<string name="setting_language_system">システム設定</string>
<string name="background_ops_label">バックグラウンド同期</string>
@ -1055,4 +1042,8 @@ K-9 Mail セットアップにようこそ。\nK-9 は標準のAndroidメール
<string name="settings_attachment_default_path">添付ファイルの保存先</string>
<string name="attachment_save_title">添付ファイルの保存先</string>
<string name="attachment_save_desc">ファイルブラウザがインストールされていません。添付ファイルの保存場所を直接入力してください。</string>
<string name="manage_accounts_move_up_action">上に移動</string>
<string name="manage_accounts_move_down_action">下に移動</string>
</resources>

101
res/values-ko/strings.xml
View File

@ -2,25 +2,28 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_name">K-9 메일</string>
<string name="beta_app_name">K-9 메일 베타</string>
<string name="app_authors">Google, The K-9 Dog Walkers.</string>
<string name="app_copyright_fmt">Copyright 2008-<xliff:g>%s</xliff:g> The K-9 Dog Walkers. Portions Copyright 2006-<xliff:g>%s</xliff:g> the Android Open Source Project.</string>
<string name="app_license">Licensed under the Apache License, Version 2.0.</string>
<string name="app_authors_fmt">Authors: <xliff:g id="app_authors">%s</xliff:g></string>
<string name="app_revision_fmt">릴리즈 정보: <xliff:g id="app_revision_url">%s</xliff:g></string>
<string name="app_libraries">K-9 메일은 아래의 서드파티 라이브러리를 이용합니다 : <xliff:g id="app_libraries_list">%s</xliff:g></string>
<string name="app_emoji_icons">Emoji 아이콘: <xliff:g id="app_emoji_icons_link">%s</xliff:g></string>
<string name="read_attachment_label">첨부 읽기</string>
<string name="read_attachment_desc">K-9이 이메일의 첨부를 읽도록 합니다</string>
<string name="read_messages_label">이메일 읽기</string>
<string name="read_messages_desc">K-9이 이메일을 읽도록 합니다.</string>
<string name="delete_messages_label">이메일 삭제</string>
<string name="delete_messages_desc">K-9이 이메일을 삭제하도록 합니다</string>
<string name="about_title_fmt"><xliff:g id="app_name">%s</xliff:g></string>
<string name="about_title_fmt"><xliff:g id="app_name">%s</xliff:g></string>
<string name="accounts_title">계정</string>
<string name="advanced">고급</string>
<string name="folder_list_title"><xliff:g id="account">%s</xliff:g> </string>
<string name="shortcuts_title">K-9 계정</string>
<string name="message_list_title"><xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g> </string>
<string name="message_list_title"><xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g> </string>
<string name="compose_title">작성</string>
<string name="debug_title">디버그</string>
@ -79,7 +82,7 @@
<string name="global_settings_action">환경 설정</string>
<string name="remove_account_action">계정 삭제</string>
<string name="clear_pending_action">예정된 작업 삭제(위험!)</string>
<string name="accounts_action">계정</string>
<string name="back_to_accounts_action">◀</string>
<string name="back_to_folder_list_action">◀</string>
@ -89,7 +92,8 @@
<string name="send_alternate_chooser_title">발신자 선택</string>
<string name="mark_all_as_read_dlg_title">모든 편지를 읽음으로 표시</string>
<string name="mark_all_as_read_dlg_instructions_fmt">\'<xliff:g id="folder">%s</xliff:g>\' 폴더의 모든 메시지를 읽음으로 표시하시겠습니까? (K-9에서 보여지지 않은 폴더의 메시지포함)</string>
<string name="mark_all_as_read_dlg_instructions_fmt">\'<xliff:g id="folder">%s</xliff:g>\' 폴더의 모든 메시지를 읽은 메시지로 표시하시겠습니까?
(K-9에서 보여지지 않은 폴더의 메시지포함)</string>
<string name="flag_action">즐겨찾기 등록</string>
<string name="unflag_action">즐겨찾기 해제</string>
@ -104,6 +108,9 @@
<string name="view_hide_details_action">세부내용 보기/숨기기 </string>
<string name="add_cc_bcc_action">참조/숨은참조 추가</string>
<string name="edit_subject_action">제목 수정</string>
<!-- NEW: <string name="read_receipt">Read receipt</string>-->
<!-- NEW: <string name="read_receipt_enabled">Read receipt will be requested</string>-->
<!-- NEW: <string name="read_receipt_disabled">Read receipt will not be requested</string>-->
<string name="add_attachment_action">첨부 추가</string>
<string name="add_attachment_action_image">첨부 추가 (이미지)</string>
<string name="add_attachment_action_video">첨부 추가 (비디오)</string>
@ -163,14 +170,14 @@
<string name="notification_bg_send_title">메일 전송중</string>
<string name="notification_bg_title_separator">:</string>
<string name="special_mailbox_name_inbox">받은 메일함</string>
<string name="special_mailbox_name_outbox">보낸 메일함</string>
<string name="special_mailbox_name_inbox">받은편지함</string>
<string name="special_mailbox_name_outbox">보낸편지함</string>
<!-- The following mailbox names will be used if the user has not specified one from the server -->
<string name="special_mailbox_name_drafts">임시 메일함</string>
<string name="special_mailbox_name_drafts">임시보관함</string>
<string name="special_mailbox_name_trash">휴지통</string>
<string name="special_mailbox_name_sent">보낸 메일함</string>
<string name="special_mailbox_name_sent">보낸편지함</string>
<string name="special_mailbox_name_archive">보관</string>
<string name="special_mailbox_name_spam">스팸메일함</string>
<string name="special_mailbox_name_spam">스팸편지함</string>
<!-- Mailbox names displayed to user -->
<string name="special_mailbox_name_drafts_fmt"><xliff:g id="folder">%s</xliff:g> (임시보관함)</string>
@ -182,12 +189,12 @@
<string name="send_failure_subject">일부 메시지를 보내는데 실패하였습니다</string>
<string name="send_failure_body_abbrev"><xliff:g id="errorFolder">%s</xliff:g> 폴더 자세히 보기</string>
<string name="send_failure_body_fmt">K-9에서 메시지를 보내는데 문제가 발생하였습니다.
하지만 문제의 특성상 K-9은 메시지가 확실히 보내졌는지 여부를 확인할 수 없습니다.
수신자는 이미 메시지를 받았을 수도 있습니다.
하지만 문제의 특성상 K-9은 메시지가 확실히 보내졌는지 여부를 확인할 수 없습니다.
수신자는 이미 메시지를 받았을 수도 있습니다.
\u000a\u000a발생된 문제 유형의 메시지는 보낸편지함에 즐겨찾기(stared) 표시가 되어있습니다.
이 즐겨찾기(stared)를 없애면 K-9은 메시지를 재전송을 시도할것입니다.
다른 발신 작업을 하기위해서는 보낸편지함을 길게 눌러 메시지 보내기를 찾으십시오.\u000A\u000a
<xliff:g id="errorFolder">%s</xliff:g> 폴더에 실패에 대한 에러메시지가 있습니다.</string>
다른 발신 작업을 하기위해서는 보낸편지함을 길게 눌러 메시지 보내기를 찾으십시오.\u000A\u000a
<xliff:g id="errorFolder">%s</xliff:g> 폴더에 실패에 대한 에러메시지가 있습니다.</string>
<string name="alert_header">K-9 알람</string>
<string name="no_connection_alert">네트워크 문제로 동기화, 메일보내기가 지연되고있습니다.</string>
@ -206,14 +213,14 @@ K-9 메일 설치를 환영합니다. K-9은 표준 안드로이드 메일 클
\n * 폴더 구독
\n * 모든 폴더 동기화
\n * 회신주소 수정
\n * 키보드 단축
\n * 키보드 단축키
\n * 향상된 IMAP 지원
\n * SD 카드에 첨부파일 저장
\n * 휴지통 비우기
\n * 메시지 정렬
\n * ...그리고 그 밖에
\n
\nK-9 메일은 다른 메일 클라이언트와 마찬가지로 대부분의 무료 hotmail 계정을 Microsoft Exchange와 연결할때 발생되는 문제로 인해 지원하지 않습니다.
\nK-9 메일은 다른 메일 클라이언트와 마찬가지로 대부분의 무료 hotmail 계정을 Microsoft Exchange와 연결할때 발생되는 문제로 인해 지원하지 않습니다.
\n
\n 버그 리포트, 새로운 기능 그리고 질문에 대한 문의는 http://k9mail.googlecode.com/ 로 남겨주시기바랍니다.
@ -229,7 +236,7 @@ K-9 메일 설치를 환영합니다. K-9은 표준 안드로이드 메일 클
<string name="combined_inbox_title">모든 메일</string>
<string name="combined_inbox_label">모든 계정의 모든 메시지</string>
<string name="combined_inbox_list_title">받은 편지함의 모든 메일</string> <!-- Inbox here should be the same as mailbox_name_inbox -->
<string name="combined_inbox_list_title">받은편지함의 모든 메일</string> <!-- Inbox here should be the same as mailbox_name_inbox -->
<string name="message_list_title_fmt"><xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g>
<xliff:g id="unread_count">%s</xliff:g>
@ -261,8 +268,7 @@ K-9 메일 설치를 환영합니다. K-9은 표준 안드로이드 메일 클
<string name="error_contact_address_not_found">이메일 주소를 찾을 수 없습니다.</string>
<string name="message_compose_downloading_attachments_toast">일부 첨부파일을 다운로드 할 수 없습니다. 이 메시지가 보내지기 이전에 자동적으로 다운로드 됩니다.</string>
<string name="message_compose_attachments_skipped_toast">다운로드 완료되지않은 일부 첨부파일을 보낼수 없습니다.</string>
<!-- NEW: <string name="message_compose_show_quoted_text_action">Quote message</string>-->
<string name="message_view_from_format">발신자: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
<string name="message_to_label">수신자:</string>
@ -282,7 +288,6 @@ K-9 메일 설치를 환영합니다. K-9은 표준 안드로이드 메일 클
<string name="message_view_fetching_attachment_toast">첨부파일 가져오는 중.</string>
<string name="message_view_no_viewer"><xliff:g id="mimetype">%s</xliff:g>에 대한 뷰어를 찾을 수 없습니다.</string>
<string name="message_view_download_remainder">다운로드 완료 메시지</string>
<!-- NOTE: The following message refers to strings with id 'account_setup_incoming_save_all_headers_label' and 'account_setup_incoming_title' -->
@ -309,7 +314,6 @@ K-9 메일 설치를 환영합니다. K-9은 표준 안드로이드 메일 클
<string name="about_header">About <xliff:g id="app_name">%s</xliff:g></string>
<string name="about_version">버전: <xliff:g id="version">%s</xliff:g></string>
<string name="global_settings_flag_label">즐겨찾기 보기</string>
<string name="global_settings_flag_summary">체크된 메시지 즐겨찾기등록</string>
<string name="global_settings_checkbox_label">체크박스 여러게 선택하기</string>
@ -329,6 +333,8 @@ K-9 메일 설치를 환영합니다. K-9은 표준 안드로이드 메일 클
<string name="global_settings_messageview_fixedwidth_summary">일반텍스트(Plain) 메시지를 보여줄때 고정 넓이 폰트사용</string>
<string name="global_settings_messageview_return_to_list_label">삭제후 목록으로</string>
<string name="global_settings_messageview_return_to_list_summary">메시지 삭제후에 메시지 목록으로 되돌아갑니다.</string>
<string name="global_settings_messageview_show_next_label">삭제 후 다음 메시지 보기</string>
<string name="global_settings_messageview_show_next_summary">메시지 삭제 후 다음 메시지를 보도록 기본값으로 설정합니다</string>
<string name="global_settings_confirm_actions_title">동작시 행동</string>
<string name="global_settings_confirm_actions_summary">설정한 행동을 할 경우 확인창을 보여줍니다.</string>
@ -341,13 +347,11 @@ K-9 메일 설치를 환영합니다. K-9은 표준 안드로이드 메일 클
<string name="global_settings_privacy_mode_title">잠긴화면에서 알림</string>
<string name="global_settings_privacy_mode_summary">화면이 잠겨있을경우 메시지 수신시 제목을 화면에 보여주지 않습니다.</string>
<string name="quiet_time">무음 시간</string>
<string name="quiet_time_description">벨소리, 부져, 플래쉬를 밤시간에 사용하지않습니다</string>
<string name="quiet_time_starts">무음 시작 시간</string>
<string name="quiet_time_ends">무음 끝나는 시간</string>
<string name="account_setup_basics_title">계정 추가</string>
<string name="account_setup_basics_instructions">이메일 계정을 입력하시오:</string>
<string name="account_setup_basics_instructions2_fmt">(<xliff:g id="number_accounts">%d</xliff:g>개의 계정을 추가하였습니다.)</string>
@ -511,7 +515,6 @@ K-9 메일 설치를 환영합니다. K-9은 표준 안드로이드 메일 클
<string name="account_setup_options_mail_display_count_1000">1000 메시지</string>
<string name="account_setup_options_mail_display_count_all">모든 메시지</string>
<string name="move_copy_cannot_copy_unsynced_message">서버와 동기화 되지않은 메시지를 복사하거나 이동할 수 없습니다.</string>
<string name="account_setup_failed_dlg_title">설정이 완료되지 않았습니다</string>
@ -555,6 +558,9 @@ K-9 메일 설치를 환영합니다. K-9은 표준 안드로이드 메일 클
<string name="account_settings_composition">메일 보내기</string>
<!-- NEW: <string name="account_settings_default_quoted_text_shown_label">Quote original message when replying</string>-->
<!-- NEW: <string name="account_settings_default_quoted_text_shown_summary">When replying to messages, the original message is in your reply.</string>-->
<string name="account_settings_reply_after_quote_label">Reply after quoted text</string>
<string name="account_settings_reply_after_quote_summary">메시지 회신시 원본 메시지를 회신메시지에 포함시킵니다.</string>
@ -562,6 +568,9 @@ K-9 메일 설치를 환영합니다. K-9은 표준 안드로이드 메일 클
<string name="account_settings_message_format_text">일반 텍스트(Plain) (이미지와 꾸밈format은 없어집니다)</string>
<string name="account_settings_message_format_html">HTML (이미지와 꾸밈format이 보존됩니다)</string>
<!-- NEW: <string name="account_settings_message_read_receipt_label">Read receipt</string>-->
<!-- NEW: <string name="account_settings_message_read_receipt_summary">Always request a read receipt</string>-->
<string name="account_settings_quote_style_label">회신시 인용문 위치</string>
<string name="account_settings_quote_style_prefix">Prefix (Gmail, Pine 처럼)</string>
<string name="account_settings_quote_style_header">Header (Outlook, Yahoo!, Hotmail 처럼)</string>
@ -585,7 +594,6 @@ K-9 메일 설치를 환영합니다. K-9은 표준 안드로이드 메일 클
<string name="account_settings_storage_title">저장장치</string>
<string name="account_settings_color_label">계정 색깔</string>
<string name="account_settings_color_summary">계정 목록과 폴더내에서 사용될 계정 색깔을 선택하시오.</string>
@ -607,6 +615,8 @@ K-9 메일 설치를 환영합니다. K-9은 표준 안드로이드 메일 클
<string name="account_settings_autodownload_message_size_512">512Kb</string>
<string name="account_settings_autodownload_message_size_1024">1Mb</string>
<string name="account_settings_autodownload_message_size_2048">2Mb</string>
<string name="account_settings_autodownload_message_size_5120">5Mb</string>
<string name="account_settings_autodownload_message_size_10240">10Mb</string>
<string name="account_settings_autodownload_message_size_any">any size (제한없음)</string>
<string name="account_settings_message_age_label">메시지 동기화 기간</string>
@ -623,7 +633,6 @@ K-9 메일 설치를 환영합니다. K-9은 표준 안드로이드 메일 클
<string name="account_settings_message_age_6_months">최근 6달</string>
<string name="account_settings_message_age_1_year">최근 1년</string>
<string name="account_settings_folder_display_mode_label">보여질 폴더</string>
<string name="account_settings_folder_display_mode_all">모든 폴더</string>
<string name="account_settings_folder_display_mode_first_class">Only 1st Class folders</string>
@ -698,7 +707,6 @@ K-9 메일 설치를 환영합니다. K-9은 표준 안드로이드 메일 클
<string name="account_settings_led_label">LED 깜빡임</string>
<string name="account_settings_led_summary">메일 도착시 LED를 깜빡입니다.</string>
<string name="account_settings_servers">서버 설정</string>
<string name="account_settings_composition_title">메시지 작성 옵션</string>
@ -746,7 +754,6 @@ K-9 메일 설치를 환영합니다. K-9은 표준 안드로이드 메일 클
<string name="choose_account_title">계정을 선택하시오</string>
<string name="send_as">다른 계정으로 보내기</string>
<string name="no_identities">신원 설정 가기 -&gt; 새로운 신원(Identity) 생성을 위한 신원(Identity) 관리</string>
<string name="no_removable_identity">신원(Identity)를 제거할 수 없습니다.</string>
<string name="identity_has_no_email">이메일 주소없이 신원(Identity)을 사용할 수 없습니다</string>
@ -783,17 +790,15 @@ K-9 메일 설치를 환영합니다. K-9은 표준 안드로이드 메일 클
<string name="account_clear_dlg_title">계정 비우기</string>
<string name="account_clear_dlg_instructions_fmt">\"<xliff:g id="account">%s</xliff:g>\"의 모든 메일이 K-9에서 삭제될것입니다. 하지만 계정 설정은 보존됩니다.</string>
<string name="provider_note_live">\"Plus\" 계정만이 이 프로그램을 POP 접근 하도록 허락합니다.
올바른 이메일 주소와 비밀번호로 로그인 실패할 경우 \"Plus\" 계정을 위해 유료전환 해야 할 것입니다.
웹브라우저를 통해 접근을 얻도록 하십시오</string>
<string name="provider_note_live">\"Plus\" 계정만이 이 프로그램을 POP 접근 하도록 허락합니다.
올바른 이메일 주소와 비밀번호로 로그인 실패할 경우 \"Plus\" 계정을 위해 유료전환 해야 할 것입니다.
웹브라우저를 통해 접근을 얻도록 하십시오</string>
<string name="provider_note_yahoojp">POP3를 이용하기위해서는 야휴 메일 설정페이지에서 POP3 이용을 설정하여야합니다.</string>
<string name="provider_note_naver">IMAP/POP3를 이용하기위해서는 네이버 메일 설정페이지에서 IMAP/POP3 이용을 설정하여야합니다.</string>
<string name="provider_note_hanmail">IMAP/POP3을 이용하기위해서는 한메일 환경설정 페이지에서 IMAP/POP3 이용을 설정하여야합니다.</string>
<string name="provider_note_paran">IMAP/POP3을 이용하기위해서는 파란 메일 환경설정 페이지에서 IMAP/POP3 이용을 설정하여야합니다.</string>
<string name="provider_note_nate">IMAP/POP3을 이용하기위해서는 네이트 메일 환경설정 페이지에서 IMAP/POP3 이용을 설정하여야합니다.</string>
<string name="account_setup_failed_dlg_invalid_certificate_title">잘못된 인증정보</string>
<string name="account_setup_failed_dlg_invalid_certificate_accept">Accept Key</string>
<string name="account_setup_failed_dlg_invalid_certificate_reject">Reject Key</string>
@ -821,8 +826,6 @@ K-9 메일 설치를 환영합니다. K-9은 표준 안드로이드 메일 클
<string name="folder_list_display_mode_first_and_second_class">Display 1st and 2nd Class folders</string>
<string name="folder_list_display_mode_not_second_class">Display all except 2nd Class folders</string>
<string name="account_settings_signature__location_label">서명 위치</string>
<string name="account_settings_signature__location_before_quoted_text">본문 앞에</string>
<string name="account_settings_signature__location_after_quoted_text">본문 뒤에</string>
@ -845,8 +848,6 @@ K-9 메일 설치를 환영합니다. K-9은 표준 안드로이드 메일 클
<string name="settings_messageview_zoom_controls_label">시스템 줌 컨트롤</string>
<string name="settings_messageview_zoom_controls_summary">Enable zoom widgets or pinch-zoom if your device supports it</string>
<string name="setting_language_system">시스템 기본값</string>
<string name="background_ops_label">벡그라운드 동기화</string>
@ -908,8 +909,8 @@ K-9 메일 설치를 환영합니다. K-9은 표준 안드로이드 메일 클
<string name="manage_back_title"> \"뒤로\" 버튼 관리</string>
<string name="manage_back_summary">\"뒤로\" 버튼이 항상 위로</string>
<string name="start_integrated_inbox_title">통합 메일함으로 시작</string>
<string name="start_integrated_inbox_summary">통합 메일함을 시작시 보여줍니다</string>
<string name="start_integrated_inbox_title">통합 편지함으로 시작</string>
<string name="start_integrated_inbox_summary">통합 편지함을 시작시 보여줍니다</string>
<string name="measure_accounts_title">계정 용량을 보여줍니다</string>
<string name="measure_accounts_summary">빠른 처리를 위해 비활성화</string>
@ -918,7 +919,7 @@ K-9 메일 설치를 환영합니다. K-9은 표준 안드로이드 메일 클
<string name="count_search_summary">빠른 처리를 위해 비활성화</string>
<string name="hide_special_accounts_title">특정 계정 숨기기</string>
<string name="hide_special_accounts_summary">통합 이메일함과 모든 편지함 숨기기</string>
<string name="hide_special_accounts_summary">통합 편지함과 모든 편지함 숨기기</string>
<string name="search_title"><xliff:g id="search_name">%s</xliff:g> <xliff:g id="modifier">%s</xliff:g></string>
<string name="flagged_modifier"> - 즐겨찾기 메일수</string>
@ -927,13 +928,13 @@ K-9 메일 설치를 환영합니다. K-9은 표준 안드로이드 메일 클
<string name="search_all_messages_title">모든 편지</string>
<string name="search_all_messages_detail">검색가능한 모든 편지</string>
<string name="integrated_inbox_title">통합 이메일함</string>
<string name="integrated_inbox_title">통합 편지함</string>
<string name="integrated_inbox_detail">통합된 폴더의 모든 이메일</string>
<string name="tap_hint">Tap envelope or star for unread or starred messages</string>
<string name="folder_settings_include_in_integrated_inbox_label">통합</string>
<string name="folder_settings_include_in_integrated_inbox_summary">모든 메시지는 통합 이메일함에 보여집니다</string>
<string name="folder_settings_include_in_integrated_inbox_summary">모든 메시지는 통합 편지함에 보여집니다</string>
<string name="account_settings_searchable_label">찾을 폴더</string>
<string name="account_settings_searchable_all">모두</string>
@ -1049,7 +1050,11 @@ K-9 메일 설치를 환영합니다. K-9은 표준 안드로이드 메일 클
<string name="account_unavailable">\"<xliff:g id="account">%s</xliff:g>\" 계정을 이용할 수 없습니다.; 저장장치를 확인하십시오.</string>
<string name="settings_attachment_default_path">첨부파일 저장위치</string>
<string name="attachment_save_title">첨부파일 저장</string>
<string name="attachment_save_desc">파일 브라우져를 찾을 수 없습니다. 첨부파일을 저장할 경로를 입력하시오</string>
<string name="settings_attachment_default_path">첨부파일 저장위치</string>
<string name="attachment_save_title">첨부파일 저장</string>
<string name="attachment_save_desc">파일 브라우져를 찾을 수 없습니다. 첨부파일을 저장할 경로를 입력하시오</string>
<string name="manage_accounts_move_up_action">위로</string>
<string name="manage_accounts_move_down_action">아래로</string>
</resources>

40
res/values-nl/strings.xml
View File

@ -83,8 +83,6 @@
<string name="remove_account_action">Verwijder account</string>
<string name="clear_pending_action">Leeg maken in afwachting van acties (gevaar!)</string>
<string name="accounts_action">Accounts</string>
<string name="back_to_accounts_action">◀</string>
<string name="back_to_folder_list_action">◀</string>
@ -109,6 +107,9 @@
<string name="view_hide_details_action">Bekijk/ verberg details</string>
<string name="add_cc_bcc_action">Voeg Cc/Bcc toe</string>
<string name="edit_subject_action">Verander onderwerp</string>
<!-- NEW: <string name="read_receipt">Read receipt</string>-->
<!-- NEW: <string name="read_receipt_enabled">Read receipt will be requested</string>-->
<!-- NEW: <string name="read_receipt_disabled">Read receipt will not be requested</string>-->
<string name="add_attachment_action">Voeg bijlage toe</string>
<string name="add_attachment_action_image">Voeg bijlage toe (Afbeelding)</string>
<string name="add_attachment_action_video">Voeg bijlage toe (Video)</string>
@ -266,8 +267,7 @@ Welkom bij K-9 Mail setup. K-9 is een open source mail cliënt voor Android, ge
<string name="error_contact_address_not_found">Geen e-mailadres gevonden.</string>
<string name="message_compose_downloading_attachments_toast">Sommige bijlagen zijn niet gedownload. Deze worden automatisch gedownload voor dat dit bericht is verzonden.</string>
<string name="message_compose_attachments_skipped_toast">Sommige bijlagen kunnen niet worden doorgestuurd omdat ze niet zijn gedownload.</string>
<!-- NEW: <string name="message_compose_show_quoted_text_action">Quote message</string>-->
<string name="message_view_from_format">Van: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
<string name="message_to_label">Aan:</string>
@ -287,7 +287,6 @@ Welkom bij K-9 Mail setup. K-9 is een open source mail cliënt voor Android, ge
<string name="message_view_fetching_attachment_toast">bijlage ophalen.</string>
<string name="message_view_no_viewer">Niet in staat viewer te vinden voor <xliff:g id="mimetype">%s</xliff:g>.</string>
<string name="message_view_download_remainder">Download compleet bericht</string>
<!-- NOTE: The following message refers to strings with id 'account_setup_incoming_save_all_headers_label' and 'account_setup_incoming_title' -->
@ -314,7 +313,6 @@ Welkom bij K-9 Mail setup. K-9 is een open source mail cliënt voor Android, ge
<string name="about_header">Over <xliff:g id="app_name">%s</xliff:g></string>
<string name="about_version">Versie: <xliff:g id="version">%s</xliff:g></string>
<string name="global_settings_flag_label">Bericht sterren</string>
<string name="global_settings_flag_summary">Sterren geven gemarkeerde berichten aan</string>
<string name="global_settings_checkbox_label">Multi-selecteer selectieboxen</string>
@ -334,6 +332,8 @@ Welkom bij K-9 Mail setup. K-9 is een open source mail cliënt voor Android, ge
<string name="global_settings_messageview_fixedwidth_summary">Gebruik een lettertype met vaste breedte bij het weergeven van plain-tekstberichten</string>
<string name="global_settings_messageview_return_to_list_label">Terug naar lijst na verwijderen</string>
<string name="global_settings_messageview_return_to_list_summary">Terug naar de berichtenlijst na bericht verwijderen</string>
<!-- NEW: <string name="global_settings_messageview_show_next_label">Show next message after delete</string>-->
<!-- NEW: <string name="global_settings_messageview_show_next_summary">Show next message by default after message deletion</string>-->
<string name="global_settings_confirm_actions_title">Bevestig acties</string>
<string name="global_settings_confirm_actions_summary">Toon een dialoogvenster altijd wanneer u de geselecteerde acties uitvoerd</string>
@ -346,13 +346,11 @@ Welkom bij K-9 Mail setup. K-9 is een open source mail cliënt voor Android, ge
<string name="global_settings_privacy_mode_title">Lock-screen meldingen</string>
<string name="global_settings_privacy_mode_summary">Niet weergegeven onderwerp van het bericht in de notificatie bar als het systeem is vergrendeld</string>
<string name="quiet_time">Stilteperiode</string>
<string name="quiet_time_description">Schakel beltoon, vibratie en leds uit gedurende de nacht</string>
<string name="quiet_time_starts">Stilteperiode start</string>
<string name="quiet_time_ends">Stilteperiode eindigt</string>
<string name="account_setup_basics_title">Een nieuwe account instellen</string>
<string name="account_setup_basics_instructions">Toets het e-mailadres in van deze account:</string>
<string name="account_setup_basics_instructions2_fmt">(Je mag meer <xliff:g id="number_accounts">%d</xliff:g> accounts toevoegen.)</string>
@ -516,7 +514,6 @@ Welkom bij K-9 Mail setup. K-9 is een open source mail cliënt voor Android, ge
<string name="account_setup_options_mail_display_count_1000">1000 berichten</string>
<string name="account_setup_options_mail_display_count_all">alle berichten</string>
<string name="move_copy_cannot_copy_unsynced_message">Kan bericht niet kopiëren of verplaatsen omdat deze niet gesynchroniseerd is met de server</string>
<string name="account_setup_failed_dlg_title">Setup kon niet afronden</string>
@ -560,6 +557,9 @@ Welkom bij K-9 Mail setup. K-9 is een open source mail cliënt voor Android, ge
<string name="account_settings_composition">Schrijven berichten</string>
<!-- NEW: <string name="account_settings_default_quoted_text_shown_label">Quote original message when replying</string>-->
<!-- NEW: <string name="account_settings_default_quoted_text_shown_summary">When replying to messages, the original message is in your reply.</string>-->
<string name="account_settings_reply_after_quote_label">Antwoorden na quote</string>
<string name="account_settings_reply_after_quote_summary">Wanneer u antwoord op berichten, zal het originele bericht boven uw antwoord staan.</string>
@ -567,6 +567,9 @@ Welkom bij K-9 Mail setup. K-9 is een open source mail cliënt voor Android, ge
<string name="account_settings_message_format_text">Platte Tekst (plaatjes en formattering worden verwijderd)</string>
<string name="account_settings_message_format_html">HTML (plaatjes en formattering blijven behouden)</string>
<!-- NEW: <string name="account_settings_message_read_receipt_label">Read receipt</string>-->
<!-- NEW: <string name="account_settings_message_read_receipt_summary">Always request a read receipt</string>-->
<string name="account_settings_quote_style_label">Quotestijl bij antwoorden</string>
<string name="account_settings_quote_style_prefix">Prefix (zoals Gmail, Pine)</string>
<string name="account_settings_quote_style_header">Header (zoals Outlook, Yahoo!, Hotmail)</string>
@ -590,7 +593,6 @@ Welkom bij K-9 Mail setup. K-9 is een open source mail cliënt voor Android, ge
<string name="account_settings_storage_title">Opslag</string>
<string name="account_settings_color_label">Account kleur</string>
<string name="account_settings_color_summary">Kies de kleur van het account gebruikt in mappen en account lijst</string>
@ -612,6 +614,8 @@ Welkom bij K-9 Mail setup. K-9 is een open source mail cliënt voor Android, ge
<string name="account_settings_autodownload_message_size_512">512Kb</string>
<string name="account_settings_autodownload_message_size_1024">1Mb</string>
<string name="account_settings_autodownload_message_size_2048">2Mb</string>
<string name="account_settings_autodownload_message_size_5120">5Mb</string>
<string name="account_settings_autodownload_message_size_10240">10Mb</string>
<string name="account_settings_autodownload_message_size_any">elke grootte (geen limiet)</string>
<string name="account_settings_message_age_label">Sync berichten van</string>
@ -628,7 +632,6 @@ Welkom bij K-9 Mail setup. K-9 is een open source mail cliënt voor Android, ge
<string name="account_settings_message_age_6_months">afgelopen 6 maanden</string>
<string name="account_settings_message_age_1_year">afgelopen jaar</string>
<string name="account_settings_folder_display_mode_label">Mappen om te laten zien</string>
<string name="account_settings_folder_display_mode_all">Alle</string>
<string name="account_settings_folder_display_mode_first_class">Alleen 1e klasse mappen</string>
@ -703,7 +706,6 @@ Welkom bij K-9 Mail setup. K-9 is een open source mail cliënt voor Android, ge
<string name="account_settings_led_label">Knipper LED</string>
<string name="account_settings_led_summary">Knipper LED wanneer mail binnenkomt</string>
<string name="account_settings_servers">Server instellingen</string>
<string name="account_settings_composition_title">Bericht samenstelling opties</string>
@ -751,7 +753,6 @@ Welkom bij K-9 Mail setup. K-9 is een open source mail cliënt voor Android, ge
<string name="choose_account_title">Kies account/identiteit</string>
<string name="send_as">Verzenden als</string>
<string name="no_identities">Ga naar Account Instellingen -&gt; Beheer identiteiten om identiteiten aan te maken</string>
<string name="no_removable_identity">Je kan je eigen identiteit niet verwijderen</string>
<string name="identity_has_no_email">Je kan een identiteit niet gebruiken zonder e-mailadres</string>
@ -790,8 +791,11 @@ Welkom bij K-9 Mail setup. K-9 is een open source mail cliënt voor Android, ge
<string name="provider_note_live">Alleen sommige \"Plus\" accounts staan POP access
toe om verbinding te krijgen met dit programma. Als het niet mogelijk is om in te loggen met de juiste gebruikersnaam en wachtwoord, heb je misschien geen betaalde \"Plus\" account. Start de webbrowser om de toegang tot deze e-mailaccount te krijgen.</string>
<string name="provider_note_yahoojp">Als je POP3 wilt gebruiken, moet je het geebruik van POP3 activeren op de Yahoo mail settings pagina.</string>
<!-- NEW: <string name="provider_note_naver">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Naver mail settings page.</string>-->
<!-- NEW: <string name="provider_note_hanmail">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Hanmail(Daum) mail settings page.</string>-->
<!-- NEW: <string name="provider_note_paran">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Paran mail settings page.</string>-->
<!-- NEW: <string name="provider_note_nate">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Nate mail settings page.</string>-->
<string name="account_setup_failed_dlg_invalid_certificate_title">Onbekend Certificaat</string>
<string name="account_setup_failed_dlg_invalid_certificate_accept">Accepteer Sleutel</string>
@ -820,8 +824,6 @@ Welkom bij K-9 Mail setup. K-9 is een open source mail cliënt voor Android, ge
<string name="folder_list_display_mode_first_and_second_class">Laat 1e en 2e klasse mappen zien</string>
<string name="folder_list_display_mode_not_second_class">Laat alles zien behalve 2e klasse mappen</string>
<string name="account_settings_signature__location_label">Positie handtekening</string>
<string name="account_settings_signature__location_before_quoted_text">Voor gequote berichten</string>
<string name="account_settings_signature__location_after_quoted_text">Na gequote berichten</string>
@ -844,8 +846,6 @@ Welkom bij K-9 Mail setup. K-9 is een open source mail cliënt voor Android, ge
<string name="settings_messageview_zoom_controls_label">Apparaat zoom</string>
<string name="settings_messageview_zoom_controls_summary">Gebruik zoom widgets of pinch-zoom als het apparaat dat ondersteunt</string>
<string name="setting_language_system">Volgens systeem</string>
<string name="background_ops_label">Achtergrond sync</string>
@ -1051,4 +1051,8 @@ Welkom bij K-9 Mail setup. K-9 is een open source mail cliënt voor Android, ge
<string name="settings_attachment_default_path">Sla bijlagen op naar...</string>
<string name="attachment_save_title">Sla bijlage op</string>
<string name="attachment_save_desc">Geen bestandsverkenner gevonden. Waar wil je deze bijlage opslaan?</string>
<!-- NEW: <string name="manage_accounts_move_up_action">Move up</string>-->
<!-- NEW: <string name="manage_accounts_move_down_action">Move down</string>-->
</resources>

40
res/values-pl/strings.xml
View File

@ -96,8 +96,6 @@
<string name="remove_account_action">Usuń konto</string>
<string name="clear_pending_action">Anuluj oczekujące zadania (niebezpieczne!)</string>
<string name="accounts_action">Konta</string>
<string name="back_to_accounts_action">◀</string>
<string name="back_to_folder_list_action">◀</string>
@ -123,6 +121,9 @@
<string name="view_hide_details_action">Pokaż/Ukryj szczegóły</string>
<string name="add_cc_bcc_action">Dodaj DW/UDW</string>
<string name="edit_subject_action">Edytuj temat</string>
<!-- NEW: <string name="read_receipt">Read receipt</string>-->
<!-- NEW: <string name="read_receipt_enabled">Read receipt will be requested</string>-->
<!-- NEW: <string name="read_receipt_disabled">Read receipt will not be requested</string>-->
<string name="add_attachment_action">Dodaj załącznik</string>
<string name="add_attachment_action_image">Dodaj załącznik (Zdjęcie)</string>
<string name="add_attachment_action_video">Add załącznik (Film)</string>
@ -278,8 +279,7 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="error_contact_address_not_found">Żaden adres email nie został znaleziony.</string>
<string name="message_compose_downloading_attachments_toast">Niektóre załączniki nie zostały pobrane. Zostaną pobrane automatycznie przed wysłaniem tej wiadomości.</string>
<string name="message_compose_attachments_skipped_toast">Niektóre załączniki nie mogą byc przesłane dalej ponieważ nie zostały wcześniej pobrane.</string>
<!-- NEW: <string name="message_compose_show_quoted_text_action">Quote message</string>-->
<string name="message_view_from_format">Od: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
<string name="message_to_label">Do:</string>
@ -299,7 +299,6 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="message_view_fetching_attachment_toast">Pobieram załącznik...</string>
<string name="message_view_no_viewer">Nie moge znaleźć programu do wyświetlenia pliku <xliff:g id="mimetype">%s</xliff:g>.</string>
<string name="message_view_download_remainder">Pobierz całą wiadomość</string>
<!-- NOTE: The following message refers to strings with id 'account_setup_incoming_save_all_headers_label' and 'account_setup_incoming_title' -->
@ -326,7 +325,6 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="about_header"><xliff:g id="app_name">%s</xliff:g></string>
<string name="about_version">wersja <xliff:g id="version">%s</xliff:g></string>
<string name="global_settings_flag_label">Oznaczaj gwiazdkami</string>
<string name="global_settings_flag_summary">Gwiazka wskazuje oznakowane wiadomości</string>
<string name="global_settings_checkbox_label">Zaznaczanie wielu maili</string>
@ -346,6 +344,8 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="global_settings_messageview_fixedwidth_summary">Użyj czcionki o stałej szerokości do wyświetlania maili tekstowych</string>
<string name="global_settings_messageview_return_to_list_label">Skasuj i wróć do listy</string>
<string name="global_settings_messageview_return_to_list_summary">Wraca do listy wiadomości po usunięciu danego maila</string>
<!-- NEW: <string name="global_settings_messageview_show_next_label">Show next message after delete</string>-->
<!-- NEW: <string name="global_settings_messageview_show_next_summary">Show next message by default after message deletion</string>-->
<string name="global_settings_confirm_actions_title">Potwierdź akcje</string>
<string name="global_settings_confirm_actions_summary">Pokaż okno dialogowe kiedy wykonujesz wybrane akcje</string>
@ -358,13 +358,11 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="global_settings_privacy_mode_title">Powiadomienia ekranowe przy zablokowanym ekranie</string>
<string name="global_settings_privacy_mode_summary">Nie pokazuj tematu wiadomości w pasku powiadimień gdy ekran jest zablokowany</string>
<string name="quiet_time">Okres ciszy</string>
<string name="quiet_time_description">Wyłącz dzwonienie, wibracje i mruganie w nocy</string>
<string name="quiet_time_starts">Początek okresu ciszy</string>
<string name="quiet_time_ends">Koniec okresu ciszy</string>
<string name="account_setup_basics_title">Dodaj konto</string>
<string name="account_setup_basics_instructions">Wpisz dane konta</string>
<string name="account_setup_basics_instructions2_fmt">(Możesz utworzyć <xliff:g id="number_accounts">%d</xliff:g> dodatkowych kont.)</string>
@ -528,7 +526,6 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="account_setup_options_mail_display_count_1000">1000 wiadomości</string>
<string name="account_setup_options_mail_display_count_all">Wszystkie wiadomości</string>
<string name="move_copy_cannot_copy_unsynced_message">Nie mogę skopiować ani przenieść wiadomości, która nie jest zsynchronizowana z serwerem</string>
<string name="account_setup_failed_dlg_title">Wystąpił błąd</string>
@ -572,6 +569,9 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="account_settings_composition">Tworzenie wiadomości</string>
<!-- NEW: <string name="account_settings_default_quoted_text_shown_label">Quote original message when replying</string>-->
<!-- NEW: <string name="account_settings_default_quoted_text_shown_summary">When replying to messages, the original message is in your reply.</string>-->
<string name="account_settings_reply_after_quote_label">Odpowiadaj po cytowanym tekście</string>
<string name="account_settings_reply_after_quote_summary">Podczas odpowiadania, wiadomość oryginalna pojawi się nad Twoją odpowiedzią.</string>
@ -579,6 +579,9 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="account_settings_message_format_text">Czysty tekst (bez obrazków i formatowania)</string>
<string name="account_settings_message_format_html">HTML (z obrazkami i formatowaniem)</string>
<!-- NEW: <string name="account_settings_message_read_receipt_label">Read receipt</string>-->
<!-- NEW: <string name="account_settings_message_read_receipt_summary">Always request a read receipt</string>-->
<string name="account_settings_quote_style_label">Styl cytowania podczas odpowiedzi</string>
<string name="account_settings_quote_style_prefix">Prefix (jak Gmail, Pine)</string>
<string name="account_settings_quote_style_header">Nagłówek (jak Outlook, Yahoo!, Hotmail)</string>
@ -602,7 +605,6 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="account_settings_storage_title">Przechowanie</string>
<string name="account_settings_color_label">Kolor konta</string>
<string name="account_settings_color_summary">Wybierz kolor, który będzie użyty przy wyświetlaniu folderów i listy kont</string>
@ -624,6 +626,8 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="account_settings_autodownload_message_size_512">512Kb</string>
<string name="account_settings_autodownload_message_size_1024">1Mb</string>
<string name="account_settings_autodownload_message_size_2048">2Mb</string>
<string name="account_settings_autodownload_message_size_5120">5Mb</string>
<string name="account_settings_autodownload_message_size_10240">10Mb</string>
<string name="account_settings_autodownload_message_size_any">dowolny rozmiar (bez limitu)</string>
<string name="account_settings_message_age_label">Synchronizuj nowsze niż</string>
@ -640,7 +644,6 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="account_settings_message_age_6_months">ostatnie 6 miesięcy</string>
<string name="account_settings_message_age_1_year">ostatni rok</string>
<string name="account_settings_folder_display_mode_label">Wyświetlaj foldery</string>
<string name="account_settings_folder_display_mode_all">Wszystkie</string>
<string name="account_settings_folder_display_mode_first_class">Tylko foldery klasy 1</string>
@ -715,7 +718,6 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="account_settings_led_label">Mrugaj diodą</string>
<string name="account_settings_led_summary">Zamrugaj diodą przy nowej wiadomości</string>
<string name="account_settings_servers">Ustawienia serwera</string>
<string name="account_settings_composition_title">Opcje tworzenia wiadomości</string>
@ -763,7 +765,6 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="choose_account_title">Wybierz konto/tożsamość</string>
<string name="send_as">Wyślij jako</string>
<string name="no_identities">Przejdź do "Ustawienia Konta" -&gt; "Tożsamości" aby utworzyć tożsamość</string>
<string name="no_removable_identity">Nie możesz usunąć jedynej tożsamości</string>
<string name="identity_has_no_email">Nie możesz użyć tożsamości bez podanego adresu email</string>
@ -805,8 +806,11 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
do swojego konta z użyciem poprawnego hasła i adresu email, najprawdopodobniej
nie masz płatnego konta typu \"Plus\". W takim przypadku musisz z poczty
korzystać w dotychczasowy sposób, za pośrednictwem przeglądarki.</string>
<string name="provider_note_yahoojp">Jeśli chcesz uzywać POP3 dla tego dostawcy, powinieneś zezwolić na użycie POP3 na stronie ustawień poczty Yahoo.</string>
<!-- NEW: <string name="provider_note_naver">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Naver mail settings page.</string>-->
<!-- NEW: <string name="provider_note_hanmail">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Hanmail(Daum) mail settings page.</string>-->
<!-- NEW: <string name="provider_note_paran">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Paran mail settings page.</string>-->
<!-- NEW: <string name="provider_note_nate">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Nate mail settings page.</string>-->
<string name="account_setup_failed_dlg_invalid_certificate_title">Nieznany certyfikat</string>
<string name="account_setup_failed_dlg_invalid_certificate_accept">Akceptuj</string>
@ -835,8 +839,6 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="folder_list_display_mode_first_and_second_class">Klasy 1 oraz 2</string>
<string name="folder_list_display_mode_not_second_class">Wszystkie poza klasą 2</string>
<string name="account_settings_signature__location_label">Umieść sygnaturę</string>
<string name="account_settings_signature__location_before_quoted_text">Przed cytowaną wiadomością</string>
<string name="account_settings_signature__location_after_quoted_text">Pod cytowaną wiadomością</string>
@ -859,8 +861,6 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<string name="settings_messageview_zoom_controls_label">Systemowe powiększenie</string>
<string name="settings_messageview_zoom_controls_summary">Użyj zoom widgets i pinch-zoom jeśli Twoje urzędzenie je obsługuje</string> <!-- FIXME -->
<string name="setting_language_system">Domyślny systemowy</string>
<string name="background_ops_label">Synchronizacja w tle</string>
@ -1064,4 +1064,8 @@ Witaj w K-9 Mail, darmowym programie pocztowym dla systemu Android. Najistotniej
<!-- NEW: <string name="settings_attachment_default_path">Save attachments to...</string>-->
<!-- NEW: <string name="attachment_save_title">Save attachment</string>-->
<!-- NEW: <string name="attachment_save_desc">No file browser found. Where would you like to save this attachment?</string>-->
<!-- NEW: <string name="manage_accounts_move_up_action">Move up</string>-->
<!-- NEW: <string name="manage_accounts_move_down_action">Move down</string>-->
</resources>

40
res/values-pt-rBR/strings.xml
View File

@ -83,8 +83,6 @@
<string name="remove_account_action">Remover conta</string>
<string name="clear_pending_action">Limpar ações pendentes (perigoso!)</string>
<string name="accounts_action">Contas</string>
<string name="back_to_accounts_action">â—€</string>
<string name="back_to_folder_list_action">â—€</string>
@ -110,6 +108,9 @@
<string name="view_hide_details_action">Ver/esconder detalhes</string>
<string name="add_cc_bcc_action">Incluir Cc/Bcc</string>
<string name="edit_subject_action">Editar assunto</string>
<!-- NEW: <string name="read_receipt">Read receipt</string>-->
<!-- NEW: <string name="read_receipt_enabled">Read receipt will be requested</string>-->
<!-- NEW: <string name="read_receipt_disabled">Read receipt will not be requested</string>-->
<string name="add_attachment_action">Incluir anexo</string>
<string name="add_attachment_action_image">Incluir anexo (Imagem)</string>
<string name="add_attachment_action_video">Incluir anexo (Video)</string>
@ -264,8 +265,7 @@ Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código
<!-- NEW: <string name="error_contact_address_not_found">No email address could be found.</string>-->
<string name="message_compose_downloading_attachments_toast">Alguns anexos não foram incluídos. Eles poderão ser incluídos automaticamente antes desta mensagem ser enviada.</string>
<string name="message_compose_attachments_skipped_toast">Alguns anexos não podem ser encaminhados porque não foram inclusos na mensagem.</string>
<!-- NEW: <string name="message_compose_show_quoted_text_action">Quote message</string>-->
<string name="message_view_from_format">De: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
<string name="message_to_label">Para:</string>
@ -285,7 +285,6 @@ Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código
<string name="message_view_fetching_attachment_toast">Buscando anexo.</string>
<string name="message_view_no_viewer">Não foi possível encontrar um visualizador para <xliff:g id="mimetype">%s</xliff:g>.</string>
<string name="message_view_download_remainder">Transferir mensagem completa</string>
<!-- NOTE: The following message refers to strings with id 'account_setup_incoming_save_all_headers_label' and 'account_setup_incoming_title' -->
@ -312,7 +311,6 @@ Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código
<string name="about_header">Sobre <xliff:g id="app_name">%s</xliff:g></string>
<string name="about_version">Versão: <xliff:g id="version">%s</xliff:g></string>
<string name="global_settings_flag_label">Mostrar favoritos</string>
<string name="global_settings_flag_summary">Estrelas indicam mensagens favoritas</string>
<string name="global_settings_checkbox_label">Caixas de multi-seleção</string>
@ -332,6 +330,8 @@ Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código
<string name="global_settings_messageview_fixedwidth_summary">Use um tamanho fixo de fonte quando mostrar mensagens com texto simples</string>
<string name="global_settings_messageview_return_to_list_label">Retornar para lista após exclusão</string>
<string name="global_settings_messageview_return_to_list_summary">Retornar para lista de mensagem após exclusão de mensagens</string>
<!-- NEW: <string name="global_settings_messageview_show_next_label">Show next message after delete</string>-->
<!-- NEW: <string name="global_settings_messageview_show_next_summary">Show next message by default after message deletion</string>-->
<string name="global_settings_confirm_actions_title">Confirmar ações</string>
<string name="global_settings_confirm_actions_summary">Mostrar diálogo sempre quando for disparada uma ação</string>
@ -344,13 +344,11 @@ Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código
<string name="global_settings_privacy_mode_title">Notificações de bloqueio de tela</string>
<string name="global_settings_privacy_mode_summary">Não mostrar assunto da mensagem na barra de status do sistema quando estiver bloqueado</string>
<string name="quiet_time">Período de silêncio</string>
<string name="quiet_time_description">Desabilitar sons, vibração e luz indicadora à noite</string>
<string name="quiet_time_starts">Início do período de silêncio</string>
<string name="quiet_time_ends">Fim do período de silêncio</string>
<string name="account_setup_basics_title">Configurar uma nova conta</string>
<string name="account_setup_basics_instructions">Informe o endereço de e-mail da conta:</string>
<string name="account_setup_basics_instructions2_fmt">(Você você pode incluir <xliff:g id="number_accounts">%d</xliff:g> mais contas.)</string>
@ -514,7 +512,6 @@ Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código
<string name="account_setup_options_mail_display_count_1000">1000 mensagens</string>
<string name="account_setup_options_mail_display_count_all">Todas as mensagens</string>
<string name="move_copy_cannot_copy_unsynced_message">Não é possível copiar ou mover uma mensagem que não foi sincronizada com o servidor</string>
<string name="account_setup_failed_dlg_title">A configuração não pode ser concluída</string>
@ -558,6 +555,9 @@ Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código
<string name="account_settings_composition">Enviando e-mails</string>
<!-- NEW: <string name="account_settings_default_quoted_text_shown_label">Quote original message when replying</string>-->
<!-- NEW: <string name="account_settings_default_quoted_text_shown_summary">When replying to messages, the original message is in your reply.</string>-->
<string name="account_settings_reply_after_quote_label">Resposta após texto da mensagem</string>
<string name="account_settings_reply_after_quote_summary">Quando respondendo mensagens, o texto original deverá aparecer acima da minha resposta.</string>
@ -565,6 +565,9 @@ Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código
<!-- NEW: <string name="account_settings_message_format_text">Plain Text (images and formatting will be removed)</string>-->
<!-- NEW: <string name="account_settings_message_format_html">HTML (images and formatting are preserved)</string>-->
<!-- NEW: <string name="account_settings_message_read_receipt_label">Read receipt</string>-->
<!-- NEW: <string name="account_settings_message_read_receipt_summary">Always request a read receipt</string>-->
<!-- NEW: <string name="account_settings_quote_style_label">Reply quoting style</string>-->
<!-- NEW: <string name="account_settings_quote_style_prefix">Prefix (like Gmail, Pine)</string>-->
<!-- NEW: <string name="account_settings_quote_style_header">Header (like Outlook, Yahoo!, Hotmail)</string>-->
@ -588,7 +591,6 @@ Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código
<string name="account_settings_storage_title">Armazenamento</string>
<string name="account_settings_color_label">Cor da conta</string>
<string name="account_settings_color_summary">Escolha uma cor para pastas e listas desta conta</string>
@ -610,6 +612,8 @@ Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código
<string name="account_settings_autodownload_message_size_512">512Kb</string>
<string name="account_settings_autodownload_message_size_1024">1Mb</string>
<string name="account_settings_autodownload_message_size_2048">2Mb</string>
<string name="account_settings_autodownload_message_size_5120">5Mb</string>
<string name="account_settings_autodownload_message_size_10240">10Mb</string>
<string name="account_settings_autodownload_message_size_any">Qualquer tamanho (sem limites)</string>
<string name="account_settings_message_age_label">Sincronização de mensagens</string>
@ -626,7 +630,6 @@ Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código
<string name="account_settings_message_age_6_months">Dos últimos 6 mêses</string>
<string name="account_settings_message_age_1_year">Do último ano</string>
<string name="account_settings_folder_display_mode_label">Visualização</string>
<string name="account_settings_folder_display_mode_all">Todas</string>
<string name="account_settings_folder_display_mode_first_class">Somente Pastas de Primeira Classe</string>
@ -701,7 +704,6 @@ Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código
<string name="account_settings_led_label">Piscar LED</string>
<string name="account_settings_led_summary">Piscar LED quando chegar e-mail</string>
<string name="account_settings_servers">Configuração de servidor</string>
<string name="account_settings_composition_title">Opções para composição de uma mensagem</string>
@ -749,7 +751,6 @@ Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código
<string name="choose_account_title">Escolher conta/identidade</string>
<string name="send_as">Enviar como</string>
<string name="no_identities">Abra Configurações de Conta -&gt; Gerenciamento de identidade para criar uma nova</string>
<string name="no_removable_identity">Você não pode remover sua única identidade</string>
<string name="identity_has_no_email">Você não pode usar uma identidade sem um endereço de e-mail</string>
@ -790,8 +791,11 @@ Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código
permitindo que este programa se conecte. Se não estiver conseguindo logar nela com seu
endereço de e-mail e senha corretos, talvez você não tenha uma conta \"Plus\" paga.
Por favor, abra seu Web browser para conseguir acesso a estes tipos de contas.</string>
<string name="provider_note_yahoojp">Se desejar utilizar POP3 para este provedor, você deverá permitir o uso deste na página de configurações de se e-mail Yahoo.</string>
<!-- NEW: <string name="provider_note_naver">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Naver mail settings page.</string>-->
<!-- NEW: <string name="provider_note_hanmail">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Hanmail(Daum) mail settings page.</string>-->
<!-- NEW: <string name="provider_note_paran">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Paran mail settings page.</string>-->
<!-- NEW: <string name="provider_note_nate">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Nate mail settings page.</string>-->
<string name="account_setup_failed_dlg_invalid_certificate_title">Certificado desconhecido</string>
<string name="account_setup_failed_dlg_invalid_certificate_accept">Aceitar chave</string>
@ -820,8 +824,6 @@ Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código
<string name="folder_list_display_mode_first_and_second_class">Mostrar pastas de Primeira e Segunda Classe</string>
<string name="folder_list_display_mode_not_second_class">Mostar todas exceto as de Segunda Classe</string>
<string name="account_settings_signature__location_label">Local da Assinatura</string>
<string name="account_settings_signature__location_before_quoted_text">Antes de escrever o texto</string>
<string name="account_settings_signature__location_after_quoted_text">Depois do texto escrito</string>
@ -844,8 +846,6 @@ Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código
<string name="settings_messageview_zoom_controls_label">Controle de zoom do sistema</string>
<string name="settings_messageview_zoom_controls_summary">Habilitar widgets de zoom se o telefone suportar</string>
<string name="setting_language_system">Padrões de sistema</string>
<string name="background_ops_label">Sincronização em segundo plano</string>
@ -1048,4 +1048,8 @@ Bem-vindo à configuração do K-9 Mail. K-9 é um cliente de e-mail com código
<!-- NEW: <string name="settings_attachment_default_path">Save attachments to...</string>-->
<!-- NEW: <string name="attachment_save_title">Save attachment</string>-->
<!-- NEW: <string name="attachment_save_desc">No file browser found. Where would you like to save this attachment?</string>-->
<!-- NEW: <string name="manage_accounts_move_up_action">Move up</string>-->
<!-- NEW: <string name="manage_accounts_move_down_action">Move down</string>-->
</resources>

229
res/values-ru/strings.xml
View File

@ -108,6 +108,9 @@
<string name="view_hide_details_action">Показать/спрятать подробности</string>
<string name="add_cc_bcc_action">Добавить Копию/СК</string>
<string name="edit_subject_action">Редактировать тему</string>
<!-- NEW: <string name="read_receipt">Read receipt</string>-->
<!-- NEW: <string name="read_receipt_enabled">Read receipt will be requested</string>-->
<!-- NEW: <string name="read_receipt_disabled">Read receipt will not be requested</string>-->
<string name="add_attachment_action">Добавить вложение</string>
<string name="add_attachment_action_image">Добавить вложение (Изображение)</string>
<string name="add_attachment_action_video">Добавить вложение (Видео)</string>
@ -256,9 +259,9 @@
<string name="error_contact_address_not_found">Не найден адрес почты.</string>
<string name="message_compose_downloading_attachments_toast">Некоторые вложения не были загружены. Они будут автоматически загружены перед отправкой этого сообщения.</string>
<string name="message_compose_attachments_skipped_toast">Некоторые вложения не могут быть пересланы, поскольку они не загрузились.</string>
<string name="message_compose_show_quoted_text_action">Цитировать сообщение</string>
<string name="message_compose_show_quoted_text_action">Цитировать сообщение</string>
<string name="message_view_from_format">От: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
<string name="message_view_from_format">От: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
<string name="message_to_label">Для:</string>
<string name="message_view_cc_label">Копия:</string>
<string name="message_view_attachment_view_action">Открыть</string>
@ -302,7 +305,6 @@
<string name="about_header">О Программе <xliff:g id="app_name">%s</xliff:g></string>
<string name="about_version">Версия: <xliff:g id="version">%s</xliff:g></string>
<string name="global_settings_flag_label">Показывать звезды</string>
<string name="global_settings_flag_summary">Звезды указывают отмеченные сообщения</string>
<string name="global_settings_checkbox_label">Флажки множественного выбора</string>
@ -322,6 +324,8 @@
<string name="global_settings_messageview_fixedwidth_summary">Использовать шрифт фиксированной ширины при показе плоского текста</string>
<string name="global_settings_messageview_return_to_list_label">Вернуться к списку после удаления</string>
<string name="global_settings_messageview_return_to_list_summary">Вернуться к списку сообщений после удаления сообщения</string>
<!-- NEW: <string name="global_settings_messageview_show_next_label">Show next message after delete</string>-->
<!-- NEW: <string name="global_settings_messageview_show_next_summary">Show next message by default after message deletion</string>-->
<string name="global_settings_confirm_actions_title">Подтверждение действий</string>
<string name="global_settings_confirm_actions_summary">Показывать диалог при совершении действий</string>
@ -334,7 +338,6 @@
<string name="global_settings_privacy_mode_title">Уведомления при заблокированном экране</string>
<string name="global_settings_privacy_mode_summary">Не показывать тему письма в уведомлениях, когда система заблокирована</string>
<string name="quiet_time">Время тишины</string>
<string name="quiet_time_description">Запретить сигнал, вибрацию, мигание в ночное время</string>
<string name="quiet_time_starts">Начинало времени тишины</string>
@ -546,16 +549,19 @@
<string name="account_settings_composition">Написание сообщений</string>
<string name="account_settings_default_quoted_text_shown_label">Цитировать оригинальное сообщение при ответе</string>
<string name="account_settings_default_quoted_text_shown_summary">Оригинальное сообщение вставляется в ответное сообщение.</string>
<string name="account_settings_default_quoted_text_shown_label">Цитировать оригинальное сообщение при ответе</string>
<string name="account_settings_default_quoted_text_shown_summary">Оригинальное сообщение вставляется в ответное сообщение.</string>
<string name="account_settings_reply_after_quote_label">Отвечать после цитаты</string>
<string name="account_settings_reply_after_quote_label">Отвечать после цитаты</string>
<string name="account_settings_reply_after_quote_summary">При ответе цитата будет выше ответа.</string>
<string name="account_settings_message_format_label">Формат сообщения</string>
<string name="account_settings_message_format_text">Плоский текст (изображения и форматирование не сохраняется)</string>
<string name="account_settings_message_format_html">HTML (сохранять изображения и форматирование)</string>
<!-- NEW: <string name="account_settings_message_read_receipt_label">Read receipt</string>-->
<!-- NEW: <string name="account_settings_message_read_receipt_summary">Always request a read receipt</string>-->
<string name="account_settings_quote_style_label">Стиль цитирования</string>
<string name="account_settings_quote_style_prefix">Префикс (например Gmail, Pine)</string>
<string name="account_settings_quote_style_header">Заголовок (например Outlook, Yahoo!, Hotmail)</string>
@ -579,7 +585,6 @@
<string name="account_settings_storage_title">Хранилище</string>
<string name="account_settings_color_label">Цвет учётной записи</string>
<string name="account_settings_color_summary">Выберите цвет учётной записи, используемый в папке и списке учётных записей</string>
@ -601,6 +606,8 @@
<string name="account_settings_autodownload_message_size_512">512Kb</string>
<string name="account_settings_autodownload_message_size_1024">1Mb</string>
<string name="account_settings_autodownload_message_size_2048">2Mb</string>
<string name="account_settings_autodownload_message_size_5120">5Mb</string>
<string name="account_settings_autodownload_message_size_10240">10Mb</string>
<string name="account_settings_autodownload_message_size_any">любого размера без ограничений</string>
<string name="account_settings_message_age_label">Синхронизировать сообщения</string>
@ -617,7 +624,6 @@
<string name="account_settings_message_age_6_months">за 6 последних месяцев</string>
<string name="account_settings_message_age_1_year">за последний год</string>
<string name="account_settings_folder_display_mode_label">Выбор показываемых папок</string>
<string name="account_settings_folder_display_mode_all">Все</string>
<string name="account_settings_folder_display_mode_first_class">Только папки 1-го класса</string>
@ -739,7 +745,6 @@
<string name="choose_account_title">Выбрать учётную запись/личность</string>
<string name="send_as">Послать как</string>
<string name="no_identities">Добавить личность можно в Настройке Ящиков -&gt; Управление личностями</string>
<string name="no_removable_identity">Нельзя удалить единственную личность.</string>
<string name="identity_has_no_email">Личность без адреса электронной почты не позволяется.</string>
@ -779,15 +784,13 @@
<string name="provider_note_live">Только некоторые \"Plus\" ящики поддерживают получение почты через \"POP\". Если вы не можете подключится
с верными данными подключения, то ваш почтовый ящик не имеет такого доступа.
Воспользуйтесь мобильной версией Yahoo! Mail для получения сообщений.</string>
<string name="provider_note_yahoojp">Если вы хотите использовать POP3 для данного поставщика, вы должны разрешить использование POP3 на странице настроек почты Yahoo.</string>
<string name="provider_note_naver">Если вы хотите использовать IMAP или POP3 для данного поставщика, вы должны разрешить использование IMAP или POP3 на странице настроек почты Naver.</string>
<string name="provider_note_hanmail">Если вы хотите использовать IMAP или POP3 для данного поставщика, вы должны разрешить использование IMAP или POP3 на странице настроек почты Hanmail(Daum).</string>
<string name="provider_note_paran">Если вы хотите использовать IMAP или POP3 для данного поставщика, вы должны разрешить использование IMAP или POP3 на странице настроек почты Paran.</string>
<string name="provider_note_nate">Если вы хотите использовать IMAP или POP3 для данного поставщика, вы должны разрешить использование IMAP или POP3 на странице настроек почты Nate.</string>
<string name="provider_note_naver">Если вы хотите использовать IMAP или POP3 для данного поставщика, вы должны разрешить использование IMAP или POP3 на странице настроек почты Naver.</string>
<string name="provider_note_hanmail">Если вы хотите использовать IMAP или POP3 для данного поставщика, вы должны разрешить использование IMAP или POP3 на странице настроек почты Hanmail(Daum).</string>
<string name="provider_note_paran">Если вы хотите использовать IMAP или POP3 для данного поставщика, вы должны разрешить использование IMAP или POP3 на странице настроек почты Paran.</string>
<string name="provider_note_nate">Если вы хотите использовать IMAP или POP3 для данного поставщика, вы должны разрешить использование IMAP или POP3 на странице настроек почты Nate.</string>
<string name="account_setup_failed_dlg_invalid_certificate_title">Сертификат не признан</string>
<string name="account_setup_failed_dlg_invalid_certificate_title">Сертификат не признан</string>
<string name="account_setup_failed_dlg_invalid_certificate_accept">Принять сертификат</string>
<string name="account_setup_failed_dlg_invalid_certificate_reject">Отклонить сертификат</string>
@ -814,8 +817,6 @@
<string name="folder_list_display_mode_first_and_second_class">Показывать папки 1-го и 2-го классов</string>
<string name="folder_list_display_mode_not_second_class">Показывать все папки, за исключением 2-го класса</string>
<string name="account_settings_signature__location_label">Размещение подписи</string>
<string name="account_settings_signature__location_before_quoted_text">перед цитатой</string>
<string name="account_settings_signature__location_after_quoted_text">после цитаты</string>
@ -849,16 +850,16 @@
<string name="no_message_seletected_toast">Никаких сообщшний не выбранно</string>
<string name="date_format_label">Формат даты</string>
<!--
The values of the date_format_* strings MUST be valid date format strings.
See Android SDK documentation for the class SimpleDateFormat.
-->
<string name="date_format_short">SHORT</string>
<string name="date_format_medium">MEDIUM</string>
<string name="date_format_common">dd-MMM-yyyy</string>
<string name="date_format_iso8601">yyyy-MM-dd</string>
<!--
The values of the date_format_* strings MUST be valid date format strings.
See Android SDK documentation for the class SimpleDateFormat.
-->
<string name="date_format_short">SHORT</string>
<string name="date_format_medium">MEDIUM</string>
<string name="date_format_common">dd-MMM-yyyy</string>
<string name="date_format_iso8601">yyyy-MM-dd</string>
<string name="batch_ops">Групповые операции</string>
<string name="batch_ops">Групповые операции</string>
<string name="batch_delete_op">Удалить выбранное</string>
<string name="batch_mark_read_op">Пометить выбранное как прочитанное</string>
<string name="batch_mark_unread_op">Пометить выбранное как не прочитанное</string>
@ -934,111 +935,117 @@
<string name="remote_control_label">Дистанционное управление K-9 Mail</string>
<string name="remote_control_desc">Позволяет этому приложению управлеть деятельностью и настройками K-9 Mail.</string>
<string name="font_size_settings_title">Размер шрифта</string>
<string name="font_size_settings_description">Настройте размер шрифта</string>
<string name="font_size_settings_title">Размер шрифта</string>
<string name="font_size_settings_description">Настройте размер шрифта</string>
<string name="font_size_account_list">Список учётных записей</string>
<string name="font_size_account_name">Название учётной записи</string>
<string name="font_size_account_description">Описание учётной записи</string>
<string name="font_size_account_list">Список учётных записей</string>
<string name="font_size_account_name">Название учётной записи</string>
<string name="font_size_account_description">Описание учётной записи</string>
<string name="font_size_folder_list">Список папок</string>
<string name="font_size_folder_name">Имя папки</string>
<string name="font_size_folder_status">Статус папки</string>
<string name="font_size_folder_list">Список папок</string>
<string name="font_size_folder_name">Имя папки</string>
<string name="font_size_folder_status">Статус папки</string>
<string name="font_size_message_list">Список сообщений</string>
<string name="font_size_message_list_subject">Тема</string>
<string name="font_size_message_list_sender">Отпрвитель</string>
<string name="font_size_message_list_date">Дата</string>
<string name="font_size_message_list_preview">Предпросмотр</string>
<string name="font_size_message_list">Список сообщений</string>
<string name="font_size_message_list_subject">Тема</string>
<string name="font_size_message_list_sender">Отпрвитель</string>
<string name="font_size_message_list_date">Дата</string>
<string name="font_size_message_list_preview">Предпросмотр</string>
<string name="font_size_message_view">Сообщения</string>
<string name="font_size_message_view_sender">отправитель</string>
<string name="font_size_message_view_to">Кому</string>
<string name="font_size_message_view_cc">Скрытая копия</string>
<string name="font_size_message_view_additional_headers">дополнительные заголовки</string>
<string name="font_size_message_view_subject">Тема</string>
<string name="font_size_message_view_time">Время</string>
<string name="font_size_message_view_date">Дата</string>
<string name="font_size_message_view_content">Тело сообщения</string>
<string name="font_size_message_view">Сообщения</string>
<string name="font_size_message_view_sender">отправитель</string>
<string name="font_size_message_view_to">Кому</string>
<string name="font_size_message_view_cc">Скрытая копия</string>
<string name="font_size_message_view_additional_headers">дополнительные заголовки</string>
<string name="font_size_message_view_subject">Тема</string>
<string name="font_size_message_view_time">Время</string>
<string name="font_size_message_view_date">Дата</string>
<string name="font_size_message_view_content">Тело сообщения</string>
<string name="font_size_tiniest">самый крочшечный</string>
<string name="font_size_tiny">Крошечный</string>
<string name="font_size_smaller">Еще меньше</string>
<string name="font_size_small">Маленький</string>
<string name="font_size_medium">средний</string>
<string name="font_size_large">Большой</string>
<string name="font_size_larger">Наибольший</string>
<string name="font_size_tiniest">самый крочшечный</string>
<string name="font_size_tiny">Крошечный</string>
<string name="font_size_smaller">Еще меньше</string>
<string name="font_size_small">Маленький</string>
<string name="font_size_medium">средний</string>
<string name="font_size_large">Большой</string>
<string name="font_size_larger">Наибольший</string>
<string name="font_size_webview_smaller">Крошечный</string>
<string name="font_size_webview_small">Маленький</string>
<string name="font_size_webview_normal">Нормальный</string>
<string name="font_size_webview_large">Большой</string>
<string name="font_size_webview_larger">Наибольший</string>
<string name="font_size_webview_smaller">Крошечный</string>
<string name="font_size_webview_small">Маленький</string>
<string name="font_size_webview_normal">Нормальный</string>
<string name="font_size_webview_large">Большой</string>
<string name="font_size_webview_larger">Наибольший</string>
<!-- Note: Contains references to preferences_action and misc_preferences_attachment_title -->
<string name="message_compose_buggy_gallery">Выберите \"Настройка\" -&gt; \"Использовать обход проблемы...\", чтобы вкладывать картинки и изображения используя Gallery 3D.</string>
<!-- Note: Contains references to preferences_action and misc_preferences_attachment_title -->
<string name="message_compose_buggy_gallery">Выберите \"Настройка\" -&gt; \"Использовать обход проблемы...\", чтобы вкладывать картинки и изображения используя Gallery 3D.</string>
<!-- Note: Contains references to add_attachment_action_image and add_attachment_action_video -->
<string name="message_compose_use_workaround">Выберите \"Добавить вложение (Картинка)\" или "Добвить вложение (Видео)\", чтобы вкладывать картинки и изображения используя Gallery 3D.</string>
<!-- Note: Contains references to add_attachment_action_image and add_attachment_action_video -->
<string name="message_compose_use_workaround">Выберите \"Добавить вложение (Картинка)\" или "Добвить вложение (Видео)\", чтобы вкладывать картинки и изображения используя Gallery 3D.</string>
<string name="miscellaneous_preferences">Разное</string>
<string name="misc_preferences_attachment_title">Использовать обход проблемы с \"Использовать галерею\"</string>
<string name="misc_preferences_attachment_description">Показывать кнопки для добавления картинок и видео вложений (чтобы обойти проблемы с 3D в Gallery)</string>
<!-- APG related -->
<string name="error_activity_not_found">Нет подходящего приложения для действия.</string>
<string name="error_apg_version_not_supported">Установленная версия APG не поддерживается.</string>
<string name="btn_crypto_sign">подписать</string>
<string name="btn_encrypt">Зашифровать</string>
<string name="btn_decrypt">Расшифровать</string>
<string name="btn_verify">проверить</string>
<string name="unknown_crypto_signature_user_id">&lt;неизвестный&gt;</string>
<string name="key_id">id: %s</string>
<string name="insufficient_apg_permissions">K-9 Mail не имеет разрешения для полного доступа к APG, please пожалуйста переустановите приложение.</string>
<string name="pgp_mime_unsupported">PGP/MIME сообщения пока не поддерживаются.</string>
<string name="attachment_encryption_unsupported">Предупреждение: вложения еще не подписаны и не зашифрованы.</string>
<string name="send_aborted">Отправка отменена.</string>
<string name="miscellaneous_preferences">Разное</string>
<string name="misc_preferences_attachment_title">Использовать обход проблемы с \"Использовать галерею\"</string>
<string name="misc_preferences_attachment_description">Показывать кнопки для добавления картинок и видео вложений (чтобы обойти проблемы с 3D в Gallery)</string>
<string name="save_or_discard_draft_message_dlg_title">Сохранить черновик сообщения?</string>
<string name="save_or_discard_draft_message_instructions_fmt">Сохранить или уничтожить сообщение?</string>
<!-- APG related -->
<string name="error_activity_not_found">Нет подходящего приложения для действия.</string>
<string name="error_apg_version_not_supported">Установленная версия APG не поддерживается.</string>
<string name="btn_crypto_sign">подписать</string>
<string name="btn_encrypt">Зашифровать</string>
<string name="btn_decrypt">Расшифровать</string>
<string name="btn_verify">проверить</string>
<string name="unknown_crypto_signature_user_id">&lt;неизвестный&gt;</string>
<string name="key_id">id: %s</string>
<string name="insufficient_apg_permissions">K-9 Mail не имеет разрешения для полного доступа к APG, please пожалуйста переустановите приложение.</string>
<string name="pgp_mime_unsupported">PGP/MIME сообщения пока не поддерживаются.</string>
<string name="attachment_encryption_unsupported">Предупреждение: вложения еще не подписаны и не зашифрованы.</string>
<string name="send_aborted">Отправка отменена.</string>
<string name="charset_not_found">Это сообщение не может быть отображено, так как кодовая страница \"<xliff:g id="charset">%s</xliff:g>\" не найдена.</string>
<string name="save_or_discard_draft_message_dlg_title">Сохранить черновик сообщения?</string>
<string name="save_or_discard_draft_message_instructions_fmt">Сохранить или уничтожить сообщение?</string>
<string name="select_text_now">Выберите текс для копирования.</string>
<string name="charset_not_found">Это сообщение не может быть отображено, так как кодовая страница \"<xliff:g id="charset">%s</xliff:g>\" не найдена.</string>
<string name="dialog_confirm_delete_title">Подтвердите удаление</string>
<string name="dialog_confirm_delete_message">Вы хотите удалить это сообщение?</string>
<string name="dialog_confirm_delete_confirm_button">Удалить</string>
<string name="dialog_confirm_delete_cancel_button">Не удалять</string>
<string name="select_text_now">Выберите текс для копирования.</string>
<string name="dialog_confirm_spam_title">Подтвердите перенос в папку Спам</string>
<plurals name="dialog_confirm_spam_message">
<item quantity="one">Вы действительно хотите переместить сообщение в папку Спам?</item>
<item quantity="other">Вы действительно хотите переместить <xliff:g id="message_count">%1$d</xliff:g> сообщений в папку Спам?</item>
<string name="dialog_confirm_delete_title">Подтвердите удаление</string>
<string name="dialog_confirm_delete_message">Вы хотите удалить это сообщение?</string>
<string name="dialog_confirm_delete_confirm_button">Удалить</string>
<string name="dialog_confirm_delete_cancel_button">Не удалять</string>
<string name="dialog_confirm_spam_title">Подтвердите перенос в папку Спам</string>
<plurals name="dialog_confirm_spam_message">
<item quantity="one">Вы действительно хотите переместить сообщение в папку Спам?</item>
<item quantity="other">Вы действительно хотите переместить <xliff:g id="message_count">%1$d</xliff:g> сообщений в папку Спам?</item>
<!--
Translators:
Translators:
Please review how to handle pluralization for your language at (1) and ajust
the <item> elements accordingly
Please review how to handle pluralization for your language at (1) and ajust
the <item> elements accordingly
Possible values for 'quantity': zero, one, two, few, many, other
Possible values for 'quantity': zero, one, two, few, many, other
(1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
(1) http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
-->
</plurals>
<string name="dialog_confirm_spam_confirm_button">Да</string>
<string name="dialog_confirm_spam_cancel_button">Нет</string>
</plurals>
<string name="dialog_confirm_spam_confirm_button">Да</string>
<string name="dialog_confirm_spam_cancel_button">Нет</string>
<string name="dialog_attachment_progress_title">Скачивание вложения</string>
<string name="dialog_attachment_progress_title">Скачивание вложения</string>
<string name="debug_logging_enabled">Разрешить журналирование отладочной информайии</string>
<string name="debug_logging_enabled">Разрешить журналирование отладочной информайии</string>
<string name="messagelist_sent_to_me_sigil">»</string>
<string name="messagelist_sent_cc_me_sigil">›</string>
<string name="error_unable_to_connect">Не получается соединиться.</string>
<string name="messagelist_sent_to_me_sigil">»</string>
<string name="messagelist_sent_cc_me_sigil">›</string>
<string name="error_unable_to_connect">Не получается соединиться.</string>
<string name="account_unavailable">Учётная запись\"<xliff:g id="account">%s</xliff:g>\" недоступна; проверьте хранилище</string>
<string name="account_unavailable">Учётная запись\"<xliff:g id="account">%s</xliff:g>\" недоступна; проверьте хранилище</string>
<string name="settings_attachment_default_path">Сохранять вложения в...</string>
<string name="attachment_save_title">Сохранить вложение</string>
<string name="attachment_save_desc">Не найден браузер файлов. Где бы вы хотели сохранить вложение?</string>
<!-- NEW: <string name="manage_accounts_move_up_action">Move up</string>-->
<!-- NEW: <string name="manage_accounts_move_down_action">Move down</string>-->
<string name="settings_attachment_default_path">Сохранять вложения в...</string>
<string name="attachment_save_title">Сохранить вложение</string>
<string name="attachment_save_desc">Не найден браузер файлов. Где бы вы хотели сохранить вложение?</string>
</resources>

40
res/values-sv/strings.xml
View File

@ -83,8 +83,6 @@
<string name="remove_account_action">Ta bort konto</string>
<string name="clear_pending_action">Rensa avvaktande handlingar (farligt!)</string>
<string name="accounts_action">Konton</string>
<string name="back_to_accounts_action">◀</string>
<string name="back_to_folder_list_action">◀</string>
@ -110,6 +108,9 @@
<string name="view_hide_details_action">Visa/dölj detaljer</string>
<string name="add_cc_bcc_action">Lägg till Cc/Bcc</string>
<string name="edit_subject_action">Redigera ämne</string>
<!-- NEW: <string name="read_receipt">Read receipt</string>-->
<!-- NEW: <string name="read_receipt_enabled">Read receipt will be requested</string>-->
<!-- NEW: <string name="read_receipt_disabled">Read receipt will not be requested</string>-->
<string name="add_attachment_action">Lägg till bilaga</string>
<string name="add_attachment_action_image">Lägg till bilaga (Bild)</string>
<string name="add_attachment_action_video">Lägg till bilaga (Video)</string>
@ -268,8 +269,7 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
<!-- NEW: <string name="error_contact_address_not_found">No email address could be found.</string>-->
<string name="message_compose_downloading_attachments_toast">Några bilagor hämtades inte. De kommer att hämtas automatiskt innan detta brev sänds.</string>
<string name="message_compose_attachments_skipped_toast">Några bilagor kan inte vidarebefordras eftersom de inte har hämtats.</string>
<!-- NEW: <string name="message_compose_show_quoted_text_action">Quote message</string>-->
<string name="message_view_from_format">Från: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
<string name="message_to_label">Till:</string>
@ -289,7 +289,6 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
<string name="message_view_fetching_attachment_toast">Hämtar bilaga.</string>
<string name="message_view_no_viewer">Kan inte hitta visare för <xliff:g id="mimetype">%s</xliff:g>.</string>
<string name="message_view_download_remainder">Hämta hem hela brevet</string>
<!-- NOTE: The following message refers to strings with id 'account_setup_incoming_save_all_headers_label' and 'account_setup_incoming_title' -->
@ -316,7 +315,6 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
<string name="about_header">Om <xliff:g id="app_name">%s</xliff:g></string>
<string name="about_version">Version: <xliff:g id="version">%s</xliff:g></string>
<string name="global_settings_flag_label">Stjärnor</string>
<string name="global_settings_flag_summary">Stjärnor indikerar flaggade brev</string>
<string name="global_settings_checkbox_label">Checkboxar för flerval</string>
@ -336,6 +334,8 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
<string name="global_settings_messageview_fixedwidth_summary">Använd ett teckensnitt med fast bredd för att visa brev med enbart text</string>
<string name="global_settings_messageview_return_to_list_label">Återvänd till listan efter radering</string>
<string name="global_settings_messageview_return_to_list_summary">Återvänd till listan efter att ha raderat ett brev</string>
<!-- NEW: <string name="global_settings_messageview_show_next_label">Show next message after delete</string>-->
<!-- NEW: <string name="global_settings_messageview_show_next_summary">Show next message by default after message deletion</string>-->
<string name="global_settings_confirm_actions_title">Bekräfta åtgärder</string>
<string name="global_settings_confirm_actions_summary">Visa en dialogruta när du genomför utvalda åtgärder</string>
@ -348,13 +348,11 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
<string name="global_settings_privacy_mode_title">Privatläge</string>
<string name="global_settings_privacy_mode_summary">Visa inte e-postens ämnen i notifieringsytan när systemet är låst</string>
<string name="quiet_time">Tyst tid</string>
<string name="quiet_time_description">Avaktivera ringsignaler, vibration och blinkande på natten</string>
<string name="quiet_time_starts">Tyst tid börjar</string>
<string name="quiet_time_ends">Tyst tid slutar</string>
<string name="account_setup_basics_title">Konfigurera ett nytt konto</string>
<string name="account_setup_basics_instructions">Ange detta kontos e-post-adress:</string>
<string name="account_setup_basics_instructions2_fmt">(Du kan lägga till ytterligare<xliff:g id="number_accounts">%d</xliff:g> konton.)</string>
@ -518,7 +516,6 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
<string name="account_setup_options_mail_display_count_1000">1000 brev</string>
<string name="account_setup_options_mail_display_count_all">alla brev</string>
<string name="move_copy_cannot_copy_unsynced_message">Kan inte kopiera eller flytta ett brev som inte är synkroniserat med servern</string>
<string name="account_setup_failed_dlg_title">Kunde inte fullborda konfigurationen</string>
@ -562,6 +559,9 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
<string name="account_settings_composition">Skriva brev</string>
<!-- NEW: <string name="account_settings_default_quoted_text_shown_label">Quote original message when replying</string>-->
<!-- NEW: <string name="account_settings_default_quoted_text_shown_summary">When replying to messages, the original message is in your reply.</string>-->
<string name="account_settings_reply_after_quote_label">Svar efter citat</string>
<string name="account_settings_reply_after_quote_summary">Vid svar på e-post placeras originalmeddelandet ovanför ditt svar.</string>
@ -569,6 +569,9 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
<string name="account_settings_message_format_text">Ren text (bilder och formatering tas bort)</string>
<string name="account_settings_message_format_html">HTML (bilder och formatering behålls)</string>
<!-- NEW: <string name="account_settings_message_read_receipt_label">Read receipt</string>-->
<!-- NEW: <string name="account_settings_message_read_receipt_summary">Always request a read receipt</string>-->
<string name="account_settings_quote_style_label">Citationsstil vid svar</string>
<string name="account_settings_quote_style_prefix">Prefix (som Gmail, Pine)</string>
<string name="account_settings_quote_style_header">Header (som Outlook, Yahoo!, Hotmail)</string>
@ -592,7 +595,6 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
<string name="account_settings_storage_title">Lagring</string>
<string name="account_settings_color_label">Kontofärg</string>
<string name="account_settings_color_summary">Välj färg för att visa detta konto i mappar och kontolistor</string>
@ -614,6 +616,8 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
<string name="account_settings_autodownload_message_size_512">512Kb</string>
<string name="account_settings_autodownload_message_size_1024">1Mb</string>
<string name="account_settings_autodownload_message_size_2048">2Mb</string>
<string name="account_settings_autodownload_message_size_5120">5Mb</string>
<string name="account_settings_autodownload_message_size_10240">10Mb</string>
<string name="account_settings_autodownload_message_size_any">Ingen gräns</string>
<string name="account_settings_message_age_label">Synka e-post från</string>
@ -630,7 +634,6 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
<string name="account_settings_message_age_6_months">senaste 6 månaderna</string>
<string name="account_settings_message_age_1_year">senaste året</string>
<string name="account_settings_folder_display_mode_label">Mappar att visa</string>
<string name="account_settings_folder_display_mode_all">Alla</string>
<string name="account_settings_folder_display_mode_first_class">Bara första klassens mappar</string>
@ -705,7 +708,6 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
<string name="account_settings_led_label">Blinka LED</string>
<string name="account_settings_led_summary">Blinka LED när det kommer ny e-post</string>
<string name="account_settings_servers">Serverinställningar</string>
<string name="account_settings_composition_title">Inställningar för att skriva brev</string>
@ -753,7 +755,6 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
<string name="choose_account_title">Välj konto/identitet</string>
<string name="send_as">Skicka som</string>
<string name="no_identities">Gå till Kontoinställningar -&gt; Hantera identiteter för att skapa en identitet</string>
<string name="no_removable_identity">Du kan inte radera din enda identitet</string>
<string name="identity_has_no_email">Du kan inte använda en identitet utan e-postadress</string>
@ -794,8 +795,11 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
vilket krävs för detta program för att ansluta. Om du misslyckas med att logga in
med din korrekta adress och lösenord så kanske du inte har ett betalt
\"Plus\"-konto. Vänligen starta webbläsaren för att komma åt dessa konton.</string>
<string name="provider_note_yahoojp">Om du vill använda POP3 med denna leverantör måste du välja att tillåta POP3 på inställningssidan för Yahoo!.</string>
<!-- NEW: <string name="provider_note_naver">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Naver mail settings page.</string>-->
<!-- NEW: <string name="provider_note_hanmail">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Hanmail(Daum) mail settings page.</string>-->
<!-- NEW: <string name="provider_note_paran">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Paran mail settings page.</string>-->
<!-- NEW: <string name="provider_note_nate">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Nate mail settings page.</string>-->
<string name="account_setup_failed_dlg_invalid_certificate_title">Okänt Certifikat</string>
<string name="account_setup_failed_dlg_invalid_certificate_accept">Acceptera nyckel</string>
@ -824,8 +828,6 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
<string name="folder_list_display_mode_first_and_second_class">Visa första och andra klassens mappar</string>
<string name="folder_list_display_mode_not_second_class">Visa alla förutom andra klassens mappar</string>
<string name="account_settings_signature__location_label">Signaturposition</string>
<string name="account_settings_signature__location_before_quoted_text">Före citerad text</string>
<string name="account_settings_signature__location_after_quoted_text">Efter citerad text</string>
@ -848,8 +850,6 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
<string name="settings_messageview_zoom_controls_label">Kontroll av zoom</string>
<string name="settings_messageview_zoom_controls_summary">Aktivera zoom-widgets eller nyp-zoom om din enhet stödjer det</string>
<string name="setting_language_system">Systemstandard</string>
<string name="background_ops_label">Bakgrundssynkronisering</string>
@ -1054,4 +1054,8 @@ Välkommen till installationen av K-9 E-post. K-9 är en e-postklient med öppen
<!-- NEW: <string name="settings_attachment_default_path">Save attachments to...</string>-->
<!-- NEW: <string name="attachment_save_title">Save attachment</string>-->
<!-- NEW: <string name="attachment_save_desc">No file browser found. Where would you like to save this attachment?</string>-->
<!-- NEW: <string name="manage_accounts_move_up_action">Move up</string>-->
<!-- NEW: <string name="manage_accounts_move_down_action">Move down</string>-->
</resources>

40
res/values-zh-rCN/strings.xml
View File

@ -83,8 +83,6 @@
<string name="remove_account_action">删除账户</string>
<string name="clear_pending_action">取消挂起的操作（慎用）</string>
<string name="accounts_action">账户</string>
<string name="back_to_accounts_action">◀</string>
<string name="back_to_folder_list_action">◀</string>
@ -109,6 +107,9 @@
<string name="view_hide_details_action">显示/隐藏详细信息</string>
<string name="add_cc_bcc_action">添加抄送/暗送</string>
<string name="edit_subject_action">编辑主题</string>
<!-- NEW: <string name="read_receipt">Read receipt</string>-->
<!-- NEW: <string name="read_receipt_enabled">Read receipt will be requested</string>-->
<!-- NEW: <string name="read_receipt_disabled">Read receipt will not be requested</string>-->
<string name="add_attachment_action">添加附件</string>
<string name="add_attachment_action_image">添加图片附件</string>
<string name="add_attachment_action_video">添加视频附件</string>
@ -255,8 +256,7 @@
<!-- NEW: <string name="error_contact_address_not_found">No email address could be found.</string>-->
<string name="message_compose_downloading_attachments_toast">一些附件没有被下载。在这个邮件发送前会自动的下载这些附件。</string>
<string name="message_compose_attachments_skipped_toast">由于一些附件还没有被下载，因此无法转发这些附件。</string>
<!-- NEW: <string name="message_compose_show_quoted_text_action">Quote message</string>-->
<string name="message_view_from_format">发件人：<xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
<string name="message_to_label">收件人：</string>
@ -276,7 +276,6 @@
<string name="message_view_fetching_attachment_toast">正在接收附件。</string>
<string name="message_view_no_viewer">无法打开<xliff:g id="mimetype">%s</xliff:g>。找不到可以阅读该文件的程序。</string>
<string name="message_view_download_remainder">下载完整邮件</string>
<!-- NOTE: The following message refers to strings with id 'account_setup_incoming_save_all_headers_label' and 'account_setup_incoming_title' -->
@ -303,7 +302,6 @@
<string name="about_header">关于<xliff:g id="app_name">%s</xliff:g></string>
<string name="about_version">版本：<xliff:g id="version">%s</xliff:g></string>
<string name="global_settings_flag_label">显示星标</string>
<string name="global_settings_flag_summary">星标指示标记过的邮件</string>
<string name="global_settings_checkbox_label">复选框</string>
@ -323,6 +321,8 @@
<string name="global_settings_messageview_fixedwidth_summary">使用定宽字体显示纯文本邮件</string>
<string name="global_settings_messageview_return_to_list_label">删除后回到自动返回到列表</string>
<string name="global_settings_messageview_return_to_list_summary">邮件删除后自动返回到邮件列表</string>
<!-- NEW: <string name="global_settings_messageview_show_next_label">Show next message after delete</string>-->
<!-- NEW: <string name="global_settings_messageview_show_next_summary">Show next message by default after message deletion</string>-->
<string name="global_settings_confirm_actions_title">确认操作</string>
<string name="global_settings_confirm_actions_summary">进行选择操作时总是显示一个对话框进行确认</string>
@ -335,13 +335,11 @@
<string name="global_settings_privacy_mode_title">锁屏通知</string>
<string name="global_settings_privacy_mode_summary">屏幕锁定时不要在通知栏中显示邮件主题</string>
<!-- NEW: <string name="quiet_time">Quiet Time</string>-->
<!-- NEW: <string name="quiet_time_description">Disable ringing, buzzing and flashing at night</string>-->
<!-- NEW: <string name="quiet_time_starts">Quiet Time starts</string>-->
<!-- NEW: <string name="quiet_time_ends">Quiet Time ends</string>-->
<string name="account_setup_basics_title">设置新账户</string>
<string name="account_setup_basics_instructions">输入该账户的电子邮件地址：</string>
<string name="account_setup_basics_instructions2_fmt">（你还可以再添加<xliff:g id="number_accounts">%d</xliff:g>个账户）</string>
@ -505,7 +503,6 @@
<string name="account_setup_options_mail_display_count_1000">1000封</string>
<!-- NEW: <string name="account_setup_options_mail_display_count_all">all messages</string>-->
<string name="move_copy_cannot_copy_unsynced_message">没有与服务器同步的邮件无法进行拷贝或移动</string>
<string name="account_setup_failed_dlg_title">无法完成设置</string>
@ -549,6 +546,9 @@
<string name="account_settings_composition">正在发送邮件</string>
<!-- NEW: <string name="account_settings_default_quoted_text_shown_label">Quote original message when replying</string>-->
<!-- NEW: <string name="account_settings_default_quoted_text_shown_summary">When replying to messages, the original message is in your reply.</string>-->
<string name="account_settings_reply_after_quote_label">在引用的文本后进行回复</string>
<string name="account_settings_reply_after_quote_summary">回复邮件时，原始邮件会显示在您的邮件的上方。</string>
@ -556,6 +556,9 @@
<!-- NEW: <string name="account_settings_message_format_text">Plain Text (images and formatting will be removed)</string>-->
<!-- NEW: <string name="account_settings_message_format_html">HTML (images and formatting are preserved)</string>-->
<!-- NEW: <string name="account_settings_message_read_receipt_label">Read receipt</string>-->
<!-- NEW: <string name="account_settings_message_read_receipt_summary">Always request a read receipt</string>-->
<!-- NEW: <string name="account_settings_quote_style_label">Reply quoting style</string>-->
<!-- NEW: <string name="account_settings_quote_style_prefix">Prefix (like Gmail, Pine)</string>-->
<!-- NEW: <string name="account_settings_quote_style_header">Header (like Outlook, Yahoo!, Hotmail)</string>-->
@ -579,7 +582,6 @@
<!-- NEW: <string name="account_settings_storage_title">Storage</string>-->
<string name="account_settings_color_label">账户颜色</string>
<string name="account_settings_color_summary">选择账户在文件夹和账户列表中显示时所使用的颜色</string>
@ -601,6 +603,8 @@
<string name="account_settings_autodownload_message_size_512">512Kb</string>
<string name="account_settings_autodownload_message_size_1024">1Mb</string>
<string name="account_settings_autodownload_message_size_2048">2Mb</string>
<string name="account_settings_autodownload_message_size_5120">5Mb</string>
<string name="account_settings_autodownload_message_size_10240">10Mb</string>
<string name="account_settings_autodownload_message_size_any">任意（无限制）</string>
<string name="account_settings_message_age_label">同步该时段内的邮件</string>
@ -617,7 +621,6 @@
<string name="account_settings_message_age_6_months">六个月内</string>
<string name="account_settings_message_age_1_year">一年内</string>
<string name="account_settings_folder_display_mode_label">显示的文件夹</string>
<string name="account_settings_folder_display_mode_all">全部</string>
<string name="account_settings_folder_display_mode_first_class">仅初级文件夹</string>
@ -692,7 +695,6 @@
<string name="account_settings_led_label">闪烁LED灯</string>
<string name="account_settings_led_summary">有新邮件时闪烁LED灯</string>
<string name="account_settings_servers">服务器设置</string>
<string name="account_settings_composition_title">撰写新邮件选项</string>
@ -740,7 +742,6 @@
<string name="choose_account_title">选择账户/身份标识</string>
<!-- NEW: <string name="send_as">Send as</string>-->
<string name="no_identities">请使用“账户设置”-&gt;“管理身份标识”来创建身份标识</string>
<string name="no_removable_identity">您必须保留一个身份标识</string>
<string name="identity_has_no_email">身份标识中必须包含电子邮件地址</string>
@ -778,8 +779,11 @@
<string name="account_clear_dlg_instructions_fmt">账户“<xliff:g id="account">%s</xliff:g>”中的全部邮件将从K-9 Mail中删除，但是账户设置将保留。</string>
<string name="provider_note_live">只有一些“高级账户”允许POP访问并允许该程序连接。如果您使用了正确的用户名和密码却仍旧无法登录，则您可能没有购买这些“高级账户”。请使用浏览器来访问这些账户。</string>
<!-- NEW: <string name="provider_note_yahoojp">If you would like to use POP3 for this provider, You should permit to use POP3 on Yahoo mail settings page.</string>-->
<!-- NEW: <string name="provider_note_naver">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Naver mail settings page.</string>-->
<!-- NEW: <string name="provider_note_hanmail">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Hanmail(Daum) mail settings page.</string>-->
<!-- NEW: <string name="provider_note_paran">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Paran mail settings page.</string>-->
<!-- NEW: <string name="provider_note_nate">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Nate mail settings page.</string>-->
<string name="account_setup_failed_dlg_invalid_certificate_title">无法识别的证书信息</string>
<string name="account_setup_failed_dlg_invalid_certificate_accept">接收密钥</string>
@ -807,8 +811,6 @@
<string name="folder_list_display_mode_first_and_second_class">显示初级和次级文件夹</string>
<string name="folder_list_display_mode_not_second_class">仅不显示次级文件夹</string>
<string name="account_settings_signature__location_label">签名位置</string>
<string name="account_settings_signature__location_before_quoted_text">在引用的文本之前</string>
<string name="account_settings_signature__location_after_quoted_text">在引用的文本之后</string>
@ -831,8 +833,6 @@
<string name="settings_messageview_zoom_controls_label">系统放大控制</string>
<string name="settings_messageview_zoom_controls_summary">如果设备支持则启用放大插件或多点触摸放大</string>
<string name="setting_language_system">系统默认值</string>
<string name="background_ops_label">后台同步</string>
@ -1035,4 +1035,8 @@
<!-- NEW: <string name="settings_attachment_default_path">Save attachments to...</string>-->
<!-- NEW: <string name="attachment_save_title">Save attachment</string>-->
<!-- NEW: <string name="attachment_save_desc">No file browser found. Where would you like to save this attachment?</string>-->
<!-- NEW: <string name="manage_accounts_move_up_action">Move up</string>-->
<!-- NEW: <string name="manage_accounts_move_down_action">Move down</string>-->
</resources>

22
res/values/strings.xml
View File

@ -83,8 +83,6 @@
<string name="remove_account_action">Remove account</string>
<string name="clear_pending_action">Clear pending actions (danger!)</string>
<string name="accounts_action">Accounts</string>
<string name="back_to_accounts_action">◀</string>
<string name="back_to_folder_list_action">◀</string>
@ -273,7 +271,6 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="message_compose_attachments_skipped_toast">Some attachments cannot be forwarded because they have not been downloaded.</string>
<string name="message_compose_show_quoted_text_action">Quote message</string>
<string name="message_view_from_format">From: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
<string name="message_to_label">To:</string>
<string name="message_view_cc_label">Cc:</string>
@ -292,7 +289,6 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="message_view_fetching_attachment_toast">Fetching attachment.</string>
<string name="message_view_no_viewer">Unable to find viewer for <xliff:g id="mimetype">%s</xliff:g>.</string>
<string name="message_view_download_remainder">Download complete message</string>
<!-- NOTE: The following message refers to strings with id 'account_setup_incoming_save_all_headers_label' and 'account_setup_incoming_title' -->
@ -319,7 +315,6 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="about_header">About <xliff:g id="app_name">%s</xliff:g></string>
<string name="about_version">Version: <xliff:g id="version">%s</xliff:g></string>
<string name="global_settings_flag_label">Show stars</string>
<string name="global_settings_flag_summary">Stars indicate flagged messages</string>
<string name="global_settings_checkbox_label">Multi-select checkboxes</string>
@ -353,13 +348,11 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="global_settings_privacy_mode_title">Lock-screen notifications</string>
<string name="global_settings_privacy_mode_summary">Don\'t display message subject in notification bar when system is locked</string>
<string name="quiet_time">Quiet Time</string>
<string name="quiet_time_description">Disable ringing, buzzing and flashing at night</string>
<string name="quiet_time_starts">Quiet Time starts</string>
<string name="quiet_time_ends">Quiet Time ends</string>
<string name="account_setup_basics_title">Set up a new account</string>
<string name="account_setup_basics_instructions">Enter this account\'s email address:</string>
<string name="account_setup_basics_instructions2_fmt">(You may add <xliff:g id="number_accounts">%d</xliff:g> more accounts.)</string>
@ -523,7 +516,6 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="account_setup_options_mail_display_count_1000">1000 messages</string>
<string name="account_setup_options_mail_display_count_all">all messages</string>
<string name="move_copy_cannot_copy_unsynced_message">Cannot copy or move a message that is not synchronized with the server</string>
<string name="account_setup_failed_dlg_title">Setup could not finish</string>
@ -603,7 +595,6 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="account_settings_storage_title">Storage</string>
<string name="account_settings_color_label">Account color</string>
<string name="account_settings_color_summary">Choose the color of the account used in folder and account list</string>
@ -643,7 +634,6 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="account_settings_message_age_6_months">the last 6 months</string>
<string name="account_settings_message_age_1_year">the last year</string>
<string name="account_settings_folder_display_mode_label">Folders to display</string>
<string name="account_settings_folder_display_mode_all">All</string>
<string name="account_settings_folder_display_mode_first_class">Only 1st Class folders</string>
@ -718,7 +708,6 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="account_settings_led_label">Blink LED</string>
<string name="account_settings_led_summary">Blink LED when mail arrives</string>
<string name="account_settings_servers">Server settings</string>
<string name="account_settings_composition_title">Message composition options</string>
@ -766,7 +755,6 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="choose_account_title">Choose account/identity</string>
<string name="send_as">Send as</string>
<string name="no_identities">Go to Account Settings -&gt; Manage Identities to create identities</string>
<string name="no_removable_identity">You can\'t remove your only identity</string>
<string name="identity_has_no_email">You can\'t use an identity without an email address</string>
@ -808,14 +796,12 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
your correct email address and password, you may not have a paid
\"Plus\" account. Please launch the Web browser to gain access to
these mail accounts.</string>
<string name="provider_note_yahoojp">If you would like to use POP3 for this provider, You should permit to use POP3 on Yahoo mail settings page.</string>
<string name="provider_note_naver">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Naver mail settings page.</string>
<string name="provider_note_hanmail">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Hanmail(Daum) mail settings page.</string>
<string name="provider_note_paran">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Paran mail settings page.</string>
<string name="provider_note_nate">If you would like to use IMAP or POP3 for this provider, You should permit to use IMAP or POP3 on Nate mail settings page.</string>
<string name="account_setup_failed_dlg_invalid_certificate_title">Unrecognized Certificate</string>
<string name="account_setup_failed_dlg_invalid_certificate_accept">Accept Key</string>
<string name="account_setup_failed_dlg_invalid_certificate_reject">Reject Key</string>
@ -843,8 +829,6 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="folder_list_display_mode_first_and_second_class">Display 1st and 2nd Class folders</string>
<string name="folder_list_display_mode_not_second_class">Display all except 2nd Class folders</string>
<string name="account_settings_signature__location_label">Signature position</string>
<string name="account_settings_signature__location_before_quoted_text">Before quoted text</string>
<string name="account_settings_signature__location_after_quoted_text">After quoted text</string>
@ -867,8 +851,6 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="settings_messageview_zoom_controls_label">System zoom controls</string>
<string name="settings_messageview_zoom_controls_summary">Enable zoom widgets or pinch-zoom if your device supports it</string>
<string name="setting_language_system">System default</string>
<string name="background_ops_label">Background sync</string>
@ -1118,5 +1100,5 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="manage_accounts_move_up_action">Move up</string>
<string name="manage_accounts_move_down_action">Move down</string>
<string name="manage_accounts_moving_message">Moving account...</string>
</resources>

2
src/com/fsck/k9/K9.java
View File

@ -259,7 +259,7 @@ public class K9 extends Application {
public static final int PUSH_WAKE_LOCK_TIMEOUT = 60000;
public static final int MAIL_SERVICE_WAKE_LOCK_TIMEOUT = 30000;
public static final int MAIL_SERVICE_WAKE_LOCK_TIMEOUT = 60000;
public static final int BOOT_RECEIVER_WAKE_LOCK_TIMEOUT = 60000;

26
src/com/fsck/k9/activity/MessageCompose.java
View File

@ -910,7 +910,8 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
boolean replyAfterQuote = false;
String action = getIntent().getAction();
if (mAccount.isReplyAfterQuote() &&
(ACTION_REPLY.equals(action) || ACTION_REPLY_ALL.equals(action))) {
(ACTION_REPLY.equals(action) || ACTION_REPLY_ALL.equals(action) ||
ACTION_EDIT_DRAFT.equals(action))) {
replyAfterQuote = true;
}
@ -1930,7 +1931,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
if (message.getSubject() != null) {
final String subject = prefix.matcher(message.getSubject()).replaceFirst("");
if (!subject.toLowerCase().startsWith("re:")) {
if (!subject.toLowerCase(Locale.US).startsWith("re:")) {
mSubjectView.setText("Re: " + subject);
} else {
mSubjectView.setText(subject);
@ -2027,10 +2028,11 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
}
}
} else if (ACTION_FORWARD.equals(action)) {
if (message.getSubject() != null && !message.getSubject().toLowerCase().startsWith("fwd:")) {
mSubjectView.setText("Fwd: " + message.getSubject());
String subject = message.getSubject();
if (subject != null && !subject.toLowerCase(Locale.US).startsWith("fwd:")) {
mSubjectView.setText("Fwd: " + subject);
} else {
mSubjectView.setText(message.getSubject());
mSubjectView.setText(subject);
}
// Quote the message and setup the UI.
@ -2189,14 +2191,22 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
Part textPart = MimeUtility.findFirstPartByMimeType(message, "text/plain");
if (textPart != null) {
String text = MimeUtility.getTextFromPart(textPart);
if (K9.DEBUG) {
Log.d(K9.LOG_TAG, "Loading message with offset " + bodyOffset + ", length " + bodyLength + ". Text length is " + text.length() + ".");
}
// If we had a body length (and it was valid), separate the composition from the quoted text
// and put them in their respective places in the UI.
if (bodyLength != null && bodyLength + 1 < text.length()) { // + 1 to get rid of the newline we added when saving the draft
String bodyText = text.substring(0, bodyLength);
String quotedText = text.substring(bodyLength + 1, text.length());
String bodyText = text.substring(bodyOffset, bodyOffset + bodyLength);
// Regenerate the quoted text without our user content in it.
StringBuilder quotedText = new StringBuilder();
quotedText.append(text.substring(0, bodyOffset)); // stuff before the reply
quotedText.append(text.substring(bodyOffset + bodyLength));
mMessageContentView.setText(bodyText);
mQuotedText.setText(quotedText);
mQuotedText.setText(quotedText.toString());
} else {
mMessageContentView.setText(text);
}

14
src/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java
View File

@ -153,9 +153,17 @@ public class AccountSetupCheckSettings extends K9Activity implements OnClickList
afe.getMessage() == null ? "" : afe.getMessage());
} catch (final CertificateValidationException cve) {
Log.e(K9.LOG_TAG, "Error while testing settings", cve);
acceptKeyDialog(
R.string.account_setup_failed_dlg_certificate_message_fmt,
cve);
// Avoid NullPointerException in acceptKeyDialog()
if (TrustManagerFactory.getLastCertChain() != null) {
acceptKeyDialog(
R.string.account_setup_failed_dlg_certificate_message_fmt,
cve);
} else {
showErrorDialog(
R.string.account_setup_failed_dlg_server_message_fmt,
(cve.getMessage() == null ? "" : cve.getMessage()));
}
} catch (final Throwable t) {
Log.e(K9.LOG_TAG, "Error while testing settings", t);
showErrorDialog(

5
src/com/fsck/k9/helper/DomainNameChecker.java
View File

@ -26,6 +26,7 @@ import java.security.cert.CertificateParsingException;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
@ -60,7 +61,7 @@ public class DomainNameChecker {
return false;
}
thisDomain = thisDomain.toLowerCase();
thisDomain = thisDomain.toLowerCase(Locale.US);
if (!isIpAddress(thisDomain)) {
return matchDns(certificate, thisDomain);
} else {
@ -223,7 +224,7 @@ public class DomainNameChecker {
return false;
}
thatDomain = thatDomain.toLowerCase();
thatDomain = thatDomain.toLowerCase(Locale.US);
// (a) domain name strings are equal, ignoring case: X matches X
boolean rval = thisDomain.equals(thatDomain);

3
src/com/fsck/k9/helper/HtmlConverter.java
View File

@ -9,6 +9,7 @@ import java.io.IOException;
import java.io.StringReader;
import java.util.Collections;
import java.util.HashSet;
import java.util.Locale;
import java.util.Set;
import java.util.regex.Matcher;
@ -64,7 +65,7 @@ public class HtmlConverter {
@Override
public void handleTag(boolean opening, String tag, Editable output, XMLReader xmlReader) {
tag = tag.toLowerCase();
tag = tag.toLowerCase(Locale.US);
if (tag.equals("hr") && opening) {
// In the case of an <hr>, replace it with a bunch of underscores. This is roughly
// the behaviour of Outlook in Rich Text mode.

14
src/com/fsck/k9/helper/Utility.java
View File

@ -12,9 +12,6 @@ import com.fsck.k9.mail.filter.Base64;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.util.regex.Matcher;
@ -36,17 +33,6 @@ public class Utility {
private static final Pattern TAG_PATTERN = Pattern.compile("\\[[-_a-z0-9]+\\] ",
Pattern.CASE_INSENSITIVE);
public static String readInputStream(InputStream in, String encoding) throws IOException {
InputStreamReader reader = new InputStreamReader(in, encoding);
StringBuilder sb = new StringBuilder();
int count;
char[] buf = new char[512];
while ((count = reader.read(buf)) != -1) {
sb.append(buf, 0, count);
}
return sb.toString();
}
public static boolean arrayContains(Object[] a, Object o) {
for (Object element : a) {
if (element.equals(o)) {

4
src/com/fsck/k9/mail/Address.java
View File

@ -131,10 +131,10 @@ public class Address {
* @return An array of 0 or more Addresses.
*/
public static Address[] parse(String addressList) {
ArrayList<Address> addresses = new ArrayList<Address>();
if ((addressList == null) && !("".equals(addressList))) {
if (addressList == null || addressList.length() == 0) {
return EMPTY_ADDRESS_ARRAY;
}
List<Address> addresses = new ArrayList<Address>();
try {
MailboxList parsedList = AddressBuilder.parseAddressList(addressList).flatten();
for (int i = 0, count = parsedList.size(); i < count; i++) {

2
src/com/fsck/k9/mail/internet/MimeMessage.java
View File

@ -131,7 +131,7 @@ public class MimeMessage extends Message {
@Override
public String getContentType() throws MessagingException {
String contentType = getFirstHeader(MimeHeader.HEADER_CONTENT_TYPE);
return (contentType == null) ? "text/plain" : contentType.toLowerCase();
return (contentType == null) ? "text/plain" : contentType.toLowerCase(Locale.US);
}
public String getDisposition() throws MessagingException {

7
src/com/fsck/k9/mail/internet/MimeMultipart.java
View File

@ -6,6 +6,8 @@ import com.fsck.k9.mail.MessagingException;
import com.fsck.k9.mail.Multipart;
import java.io.*;
import java.util.Locale;
import java.util.Random;
public class MimeMultipart extends Multipart {
protected String mPreamble;
@ -37,12 +39,13 @@ public class MimeMultipart extends Multipart {
}
public String generateBoundary() {
Random random = new Random();
StringBuilder sb = new StringBuilder();
sb.append("----");
for (int i = 0; i < 30; i++) {
sb.append(Integer.toString((int)(Math.random() * 35), 36));
sb.append(Integer.toString(random.nextInt(36), 36));
}
return sb.toString().toUpperCase();
return sb.toString().toUpperCase(Locale.US);
}
public String getPreamble() {

7
src/com/fsck/k9/mail/internet/MimeUtility.java
View File

@ -12,6 +12,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Locale;
import java.util.regex.Pattern;
import java.nio.charset.Charset;
import java.nio.charset.IllegalCharsetNameException;
@ -943,7 +944,7 @@ public class MimeUtility {
return parts[0];
}
for (String part : parts) {
if (part.trim().toLowerCase().startsWith(name.toLowerCase())) {
if (part.trim().toLowerCase(Locale.US).startsWith(name.toLowerCase(Locale.US))) {
String parameter = part.split("=", 2)[1].trim();
if (parameter.startsWith("\"") && parameter.endsWith("\"")) {
return parameter.substring(1, parameter.length() - 1);
@ -1187,7 +1188,7 @@ public class MimeUtility {
String extension = null;
if (filename != null && filename.lastIndexOf('.') != -1) {
extension = filename.substring(filename.lastIndexOf('.') + 1).toLowerCase();
extension = filename.substring(filename.lastIndexOf('.') + 1).toLowerCase(Locale.US);
returnedType = android.webkit.MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension);
}
// If the MIME type set by the user's mailer is application/octet-stream, try to figure
@ -1266,7 +1267,7 @@ public class MimeUtility {
if (charset == null || "0".equals(charset))
charset = "US-ASCII"; // No encoding, so use us-ascii, which is the standard.
charset = charset.toLowerCase();
charset = charset.toLowerCase(Locale.US);
if (charset.equals("cp932"))
charset = "shift_jis";
else if (charset.equals("koi8-u"))

8
src/com/fsck/k9/mail/store/ImapResponseParser.java
View File

@ -339,10 +339,6 @@ public class ImapResponseParser {
return (String)get(index);
}
public InputStream getLiteral(int index) {
return (InputStream)get(index);
}
public int getNumber(int index) {
return Integer.parseInt(getString(index));
}
@ -384,10 +380,6 @@ public class ImapResponseParser {
return (String)getKeyedValue(key);
}
public InputStream getKeyedLiteral(Object key) {
return (InputStream)getKeyedValue(key);
}
public int getKeyedNumber(Object key) {
return Integer.parseInt(getKeyedString(key));
}

26
src/com/fsck/k9/mail/store/ImapStore.java
View File

@ -1619,7 +1619,7 @@ public class ImapStore extends Store {
* what type it is and bail out.
*/
String subType = bs.getString(i);
mp.setSubType(subType.toLowerCase());
mp.setSubType(subType.toLowerCase(Locale.US));
break;
}
}
@ -1648,7 +1648,7 @@ public class ImapStore extends Store {
String type = bs.getString(0);
String subType = bs.getString(1);
String mimeType = (type + "/" + subType).toLowerCase();
String mimeType = (type + "/" + subType).toLowerCase(Locale.US);
ImapList bodyParams = null;
if (bs.get(2) instanceof ImapList) {
@ -1704,7 +1704,7 @@ public class ImapStore extends Store {
if (bodyDisposition != null && bodyDisposition.size() > 0) {
if (!"NIL".equalsIgnoreCase(bodyDisposition.getString(0))) {
contentDisposition = bodyDisposition.getString(0).toLowerCase();
contentDisposition = bodyDisposition.getString(0).toLowerCase(Locale.US);
}
if ((bodyDisposition.size() > 1)
@ -1716,7 +1716,7 @@ public class ImapStore extends Store {
*/
for (int i = 0, count = bodyDispositionParams.size(); i < count; i += 2) {
contentDisposition += String.format(";\n %s=\"%s\"",
bodyDispositionParams.getString(i).toLowerCase(),
bodyDispositionParams.getString(i).toLowerCase(Locale.US),
bodyDispositionParams.getString(i + 1));
}
}
@ -1899,23 +1899,11 @@ public class ImapStore extends Store {
for (int i = 0, count = messages.length; i < count; i++) {
uids[i] = messages[i].getUid();
}
ArrayList<String> flagNames = new ArrayList<String>();
for (Flag flag : flags) {
if (flag == Flag.SEEN) {
flagNames.add("\\Seen");
} else if (flag == Flag.DELETED) {
flagNames.add("\\Deleted");
} else if (flag == Flag.ANSWERED) {
flagNames.add("\\Answered");
} else if (flag == Flag.FLAGGED) {
flagNames.add("\\Flagged");
}
}
try {
executeSimpleCommand(String.format("UID STORE %s %sFLAGS.SILENT (%s)",
Utility.combine(uids, ','),
value ? "+" : "-",
Utility.combine(flagNames.toArray(new String[flagNames.size()]), ' ')));
combineFlags(flags)));
} catch (IOException ioe) {
throw ioExceptionHandler(mConnection, ioe);
}
@ -2011,7 +1999,7 @@ public class ImapStore extends Store {
// {
// Log.v(K9.LOG_TAG, "Saving capability '" + capability + "' for " + getLogId());
// }
capabilities.add(((String)capability).toUpperCase());
capabilities.add(((String)capability).toUpperCase(Locale.US));
}
}
@ -2321,7 +2309,7 @@ public class ImapStore extends Store {
}
protected boolean hasCapability(String capability) {
return capabilities.contains(capability.toUpperCase());
return capabilities.contains(capability.toUpperCase(Locale.US));
}
public boolean isOpen() {

14
src/com/fsck/k9/mail/store/LocalStore.java
View File

@ -81,7 +81,7 @@ public class LocalStore extends Store implements Serializable {
private static final Set<String> HEADERS_TO_SAVE;
static {
Set<String> set = new HashSet();
Set<String> set = new HashSet<String>();
set.add(K9.IDENTITY_HEADER);
set.add("To");
set.add("Cc");
@ -1601,10 +1601,10 @@ public class LocalStore extends Store implements Serializable {
String htmlContent = cursor.getString(0);
String textContent = cursor.getString(1);
String mimeType = cursor.getString(2);
if (mimeType != null && mimeType.toLowerCase().startsWith("multipart/")) {
if (mimeType != null && mimeType.toLowerCase(Locale.US).startsWith("multipart/")) {
// If this is a multipart message, preserve both text
// and html parts, as well as the subtype.
mp.setSubType(mimeType.toLowerCase().replaceFirst("^multipart/", ""));
mp.setSubType(mimeType.toLowerCase(Locale.US).replaceFirst("^multipart/", ""));
if (textContent != null) {
LocalTextBody body = new LocalTextBody(textContent, htmlContent);
MimeBodyPart bp = new MimeBodyPart(body, "text/plain");
@ -2144,7 +2144,7 @@ public class LocalStore extends Store implements Serializable {
cv.put("sender_list", Address.pack(message.getFrom()));
cv.put("date", message.getSentDate() == null
? System.currentTimeMillis() : message.getSentDate().getTime());
cv.put("flags", Utility.combine(message.getFlags(), ',').toUpperCase());
cv.put("flags", Utility.combine(message.getFlags(), ',').toUpperCase(Locale.US));
cv.put("deleted", message.isSet(Flag.DELETED) ? 1 : 0);
cv.put("folder_id", mFolderId);
cv.put("to_list", Address.pack(message.getRecipients(RecipientType.TO)));
@ -2263,7 +2263,7 @@ public class LocalStore extends Store implements Serializable {
message.getSentDate() == null ? System
.currentTimeMillis() : message.getSentDate()
.getTime(),
Utility.combine(message.getFlags(), ',').toUpperCase(),
Utility.combine(message.getFlags(), ',').toUpperCase(Locale.US),
mFolderId,
Address.pack(message
.getRecipients(RecipientType.TO)),
@ -2337,7 +2337,7 @@ public class LocalStore extends Store implements Serializable {
db.execSQL("UPDATE messages " + "SET flags = ? " + " WHERE id = ?",
new Object[]
{ Utility.combine(appendedFlags.toArray(), ',').toUpperCase(), id });
{ Utility.combine(appendedFlags.toArray(), ',').toUpperCase(Locale.US), id });
}
return null;
}
@ -3189,7 +3189,7 @@ public class LocalStore extends Store implements Serializable {
* Set the flags on the message.
*/
db.execSQL("UPDATE messages " + "SET flags = ? " + " WHERE id = ?", new Object[]
{ Utility.combine(getFlags(), ',').toUpperCase(), mId });
{ Utility.combine(getFlags(), ',').toUpperCase(Locale.US), mId });
return null;
}
});

2
src/com/fsck/k9/mail/store/TrustManagerFactory.java
View File

@ -76,6 +76,8 @@ public final class TrustManagerFactory {
public void checkServerTrusted(X509Certificate[] chain, String authType)
throws CertificateException {
// FIXME: Using a static field to store the certificate chain is a bad idea. Instead
// create a CertificateException subclass and store the chain there.
TrustManagerFactory.setLastCertChain(chain);
try {
defaultTrustManager.checkServerTrusted(chain, authType);

2
src/com/fsck/k9/mail/store/WebDavStore.java
View File

@ -2032,7 +2032,7 @@ public class WebDavStore extends Store {
public void setUrl(String url) {
// TODO: This is a not as ugly hack (ie, it will actually work)
// XXX: prevent URLs from getting to us that are broken
if (!(url.toLowerCase().contains("http"))) {
if (!(url.toLowerCase(Locale.US).contains("http"))) {
if (!(url.startsWith("/"))) {
url = "/" + url;
}

390
src/com/fsck/k9/service/CoreService.java
View File

@ -18,116 +18,167 @@ import com.fsck.k9.helper.power.TracingPowerManager;
import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock;
/**
* Note: All documentation in this file market <CK:RE> is documentation written by Christian Knecht by reverse engineering.
* This documentation is without warranty and may not be accurate nor reflect the author's original intent.
*
* <CK:RE>
* CoreService is the base class for all K9 Services.
*
* An Android service is a way to model a part of an application that needs to accomplish certain tasks without the
* UI part of the application being necessarily active (of course an application could also be a pure service, without
* any UI; this is not the case of K9). By declaring a service and starting it, the OS knows that the application has
* work to do and should avoid killing the process.
*
* A service's main purpose is to do some task (usually in the background) which requires one of more threads. The
* thread that starts the service is the same as the UI thread of the process. It should thus not be used to run
* the tasks.
*
* CoreService is providing the execution plumbing for background tasks including the required thread and task queuing
* for all K9 services to use.
*
* A service is supposed to run only as long as it has some work to do whether that work is active processing or some
* just some monitoring, like listening on a network port for incoming connections or listing on an open network
* connection for incoming data (push mechanism).
*
* To make sure the service is running only when required, is must be shutdown after tasks are done. As the
* execution of tasks is abstracted away in this class, it also proper shutdown handling if approriate. If
* the Service requires this is should call enableAutoShutdown(true) in it's onCreate() method.
* {@code CoreService} is the base class for all K-9 Services.
*
* While a service is running it's tasks, it is usually not a good idea to let the device go to sleep more.
* WakeLocks are used to avoid this. CoreService provides a central registry (singleton) that can be used
* application-wide to store WakeLocks.
*
* In short, CoreService provides the following features to K9 Services:
* - task execution and queuing
* - Service life cycle management (insures the service is stopped when not needed anymore); disabled by default
* - WakeLock registry and management
*
* </CK:RE>
* <p>
* An Android service is a way to model a part of an application that needs to accomplish certain
* tasks without the UI part of the application being necessarily active (of course an application
* could also be a pure service, without any UI; this is not the case of K-9). By declaring a
* service and starting it, the OS knows that the application has work to do and should avoid
* killing the process.
* </p><p>
* A service's main purpose is to do some task (usually in the background) which requires one or
* more threads. The thread that starts the service is the same as the UI thread of the process. It
* should thus not be used to run the tasks.
* </p><p>
* CoreService is providing the execution plumbing for background tasks including the required
* thread and task queuing for all K9 services to use.
* </p><p>
* A service is supposed to run only as long as it has some work to do whether that work is active
* processing or some just some monitoring, like listening on a network port for incoming connections
* or listing on an open network connection for incoming data (push mechanism).
* </p><p>
* To make sure the service is running only when required, is must be shutdown after tasks are
* done. As the execution of tasks is abstracted away in this class, it also handles proper
* shutdown. If a Service doesn't want this, it needs to call {@code enableAutoShutdown(true)} in
* its {@link Service#onCreate()} method.
* </p><p>
* While a service is running its tasks, it is usually not a good idea to let the device go to
* sleep mode. Wake locks are used to avoid this. CoreService provides a central registry
* (singleton) that can be used application-wide to store wake locks.
* </p><p>
* In short, CoreService provides the following features to K-9 Services:
* <ul>
* <li>task execution and queuing</li>
* <li>Service life cycle management (ensures the service is stopped when not needed anymore);
* enabled by default</li>
* <li>wake lock registry and management</li>
* </ul>
*/
public abstract class CoreService extends Service {
public static String WAKE_LOCK_ID = "com.fsck.k9.service.CoreService.wakeLockId"; // CK:Intent attribute ID
private static ConcurrentHashMap<Integer, TracingWakeLock> wakeLocks = new ConcurrentHashMap<Integer, TracingWakeLock>(); // CK:WakeLocks registry
private static AtomicInteger wakeLockSeq = new AtomicInteger(0); // CK:WakeLock registry
private ExecutorService threadPool = null; // CK:Threadpool with a single thread; used to execute and queue background actions inside the service
private final String className = getClass().getName();
private volatile boolean mShutdown = false; // CK:A:Seems to be used only when the service is "officially" shutdown to make sure that an exception raise because of the shutdown gets ignored.
public static String WAKE_LOCK_ID = "com.fsck.k9.service.CoreService.wakeLockId";
private static ConcurrentHashMap<Integer, TracingWakeLock> sWakeLocks =
new ConcurrentHashMap<Integer, TracingWakeLock>();
private static AtomicInteger sWakeLockSeq = new AtomicInteger(0);
/**
* Controls the auto-shutdown mechanism of the service. The default service life-cycle model is that the service should run
* only as long as a task is running. If a service should behave differently, disable auto-shutdown.
* Threadpool that is used to execute and queue background actions inside the service.
*/
private ExecutorService mThreadPool = null;
/**
* String of the class name used in debug messages.
*/
private final String className = getClass().getName();
/**
* {@code true} if the {@code Service}'s {@link #onDestroy()} method was called. {@code false}
* otherwise.
*
* <p>
* <strong>Note:</strong>
* This is used to ignore (expected) {@link RejectedExecutionException}s thrown by
* {@link ExecutorService#execute(Runnable)} after the service (and with that, the thread pool)
* was shut down.
* </p>
*/
private volatile boolean mShutdown = false;
/**
* Controls the auto shutdown mechanism of the service.
*
* <p>
* The default service life-cycle model is that the service should run only as long as a task
* is running. If a service should behave differently, disable auto shutdown using
* {@link #setAutoShutdown(boolean)}.
* </p>
*/
private boolean mAutoShutdown = true;
/**
* This variable is part of the auto-shutdown feature and determines whether the service has to be shutdown at the
* end of the onStart() method or not.
* This variable is part of the auto shutdown feature and determines whether the service has to
* be shutdown at the end of the {@link #onStart(Intent, int)} method or not.
*/
protected boolean mImmediateShutdown = true; //
@Override
public void onCreate() {
if (K9.DEBUG)
Log.i(K9.LOG_TAG, "CoreService: " + className + ".onCreate()");
threadPool = Executors.newFixedThreadPool(1); // Must be single threaded
super.onCreate();
protected boolean mImmediateShutdown = true;
}
/**
* Adds an existing WakeLock identified by it's WakeLock-ID to the specified Intent.
* @param i
* Adds an existing wake lock identified by its registry ID to the specified intent.
*
* @param context
* A {@link Context} instance. Never {@code null}.
* @param intent
* The {@link Intent} to add the wake lock registy ID as extra to. Never {@code null}.
* @param wakeLockId
* The wake lock registry ID of an existing wake lock or {@code null}.
* @param createIfNotExists
* If {@code wakeLockId} is {@code null} and this parameter is {@code true} a new wake
* lock is created, registered, and added to {@code intent}.
*/
protected static void addWakeLockId(Context context, Intent i, Integer wakeLockId, boolean createIfNotExists) {
protected static void addWakeLockId(Context context, Intent intent, Integer wakeLockId,
boolean createIfNotExists) {
if (wakeLockId != null) {
i.putExtra(BootReceiver.WAKE_LOCK_ID, wakeLockId);
intent.putExtra(BootReceiver.WAKE_LOCK_ID, wakeLockId);
return;
}
if (createIfNotExists)
addWakeLock(context,i);
if (createIfNotExists) {
addWakeLock(context,intent);
}
}
/**
* Adds a new WakeLock to the intent.
* This will add the WakeLock to the central WakeLock registry managed by this class.
* @param context Required to be able to create a new wake-lock.
* @param i Intent to which to add the WakeLock (CK:Q:still unclear why we need to link Intents and WakeLocks)
* Adds a new wake lock to the specified intent.
*
* <p>
* This will add the wake lock to the central wake lock registry managed by this class.
* </p>
*
* @param context
* A {@link Context} instance. Never {@code null}.
* @param intent
* The {@link Intent} to add the wake lock registy ID as extra to. Never {@code null}.
*/
protected static void addWakeLock(Context context, Intent i) {
TracingWakeLock wakeLock = acquireWakeLock(context,"CoreService addWakeLock",K9.MAIL_SERVICE_WAKE_LOCK_TIMEOUT); // CK:Q: What this timeout? 30secs seems a bizarre choice. It it's a safeguard it should be longer, if it's to cover the real time required by some operation, it seems too short (though I say this before knowing really what the service is supposed to do)
protected static void addWakeLock(Context context, Intent intent) {
TracingWakeLock wakeLock = acquireWakeLock(context, "CoreService addWakeLock",
K9.MAIL_SERVICE_WAKE_LOCK_TIMEOUT);
Integer tmpWakeLockId = registerWakeLock(wakeLock);
i.putExtra(WAKE_LOCK_ID, tmpWakeLockId);
intent.putExtra(WAKE_LOCK_ID, tmpWakeLockId);
}
/**
* Register WakeLock and returns its registry-entry-ID
* Registers a wake lock with the wake lock registry.
*
* @param wakeLock
* @return
* AUTHOR chrisk
* The {@link TracingWakeLock} instance that should be registered with the wake lock
* registry. Never {@code null}.
*
* @return The ID that identifies this wake lock in the registry.
*/
protected static Integer registerWakeLock(TracingWakeLock wakeLock) {
Integer tmpWakeLockId = wakeLockSeq.getAndIncrement();
wakeLocks.put(tmpWakeLockId, wakeLock);
// Get a new wake lock ID
Integer tmpWakeLockId = sWakeLockSeq.getAndIncrement();
// Store the wake lock in the registry
sWakeLocks.put(tmpWakeLockId, wakeLock);
return tmpWakeLockId;
}
/**
* Acquires a WakeLock in a K9 standard way
* Acquires a wake lock.
*
* @param context
* @return
* AUTHOR chrisk
* A {@link Context} instance. Never {@code null}.
* @param tag
* The tag to supply to {@link TracingPowerManager}.
* @param timeout
* The wake lock timeout.
*
* @return A new {@link TracingWakeLock} instance.
*/
protected static TracingWakeLock acquireWakeLock(Context context, String tag, long timeout) {
TracingPowerManager pm = TracingPowerManager.getPowerManager(context);
@ -138,29 +189,50 @@ public abstract class CoreService extends Service {
}
@Override
public void onStart(Intent intent, int startId) {
public void onCreate() {
if (K9.DEBUG) {
Log.i(K9.LOG_TAG, "CoreService: " + className + ".onCreate()");
}
mThreadPool = Executors.newFixedThreadPool(1); // Must be single threaded
super.onCreate();
}
@Override
public final void onStart(Intent intent, int startId) {
// deprecated method but still used for backwards compatibility with Android version <2.0
// CK:DocAdded: Manage wake-locks, especially, release any wake-locks held so far and define a new "local" wake lock.
// Also, because we create a new wakelock, we re-initialize the wakelock timeout and give
// the service-start code a protection of up to MAIL_SERVICE_WAKE_LOCK_TIMEOUT (currently 30s).
TracingWakeLock wakeLock = acquireWakeLock(this,"CoreService onStart",K9.MAIL_SERVICE_WAKE_LOCK_TIMEOUT);
if (K9.DEBUG)
// Acquire new wake lock
TracingWakeLock wakeLock = acquireWakeLock(this, "CoreService onStart",
K9.MAIL_SERVICE_WAKE_LOCK_TIMEOUT);
if (K9.DEBUG) {
Log.i(K9.LOG_TAG, "CoreService: " + className + ".onStart(" + intent + ", " + startId);
}
// If we were started by BootReceiver, release the wake lock acquired there.
int wakeLockId = intent.getIntExtra(BootReceiver.WAKE_LOCK_ID, -1);
if (wakeLockId != -1) {
BootReceiver.releaseWakeLock(this, wakeLockId);
}
Integer coreWakeLockId = intent.getIntExtra(WAKE_LOCK_ID, -1);
if (coreWakeLockId != null && coreWakeLockId != -1) {
if (K9.DEBUG)
// If we were passed an ID from our own wake lock registry, retrieve that wake lock and
// release it.
int coreWakeLockId = intent.getIntExtra(WAKE_LOCK_ID, -1);
if (coreWakeLockId != -1) {
if (K9.DEBUG) {
Log.d(K9.LOG_TAG, "Got core wake lock id " + coreWakeLockId);
TracingWakeLock coreWakeLock = wakeLocks.remove(coreWakeLockId);
}
// Remove wake lock from the registry
TracingWakeLock coreWakeLock = sWakeLocks.remove(coreWakeLockId);
// Release wake lock
if (coreWakeLock != null) {
if (K9.DEBUG)
Log.d(K9.LOG_TAG, "Found core wake lock with id " + coreWakeLockId + ", releasing");
if (K9.DEBUG) {
Log.d(K9.LOG_TAG, "Found core wake lock with id " + coreWakeLockId +
", releasing");
}
coreWakeLock.release();
}
}
@ -171,117 +243,179 @@ public abstract class CoreService extends Service {
super.onStart(intent, startId);
startService(intent, startId);
} finally {
try{wakeLock.release();} catch (Exception e) {/* ignore */}
try{if (mAutoShutdown && mImmediateShutdown && startId != -1) stopSelf(startId);} catch (Exception e) {/* ignore */}
try {
// Release the wake lock acquired at the start of this method
wakeLock.release();
} catch (Exception e) { /* ignore */ }
try {
// If there is no outstanding work to be done in a background thread we can stop
// this service.
if (mAutoShutdown && mImmediateShutdown && startId != -1) {
stopSelf(startId);
}
} catch (Exception e) { /* ignore */ }
}
}
/**
*
* Execute a task in the background thread.
*
* @param context
* A {@link Context} instance. Never {@code null}.
* @param runner
* The code to be executed in the background thread.
* @param wakeLockTime
* The timeout for the wake lock that will be acquired by this method.
* @param startId
* @return returns whether service-shutdown will actually happen after the task has been executed (or has already been done).
* The {@code startId} value received in {@link #onStart(Intent, int)} or {@code null}
* if you don't want the service to be shut down after {@code runner} has been executed
* (e.g. because you need to run another background task).<br>
* If this parameter is {@code null} you need to call {@code setAutoShutdown(false)}
* otherwise the auto shutdown code will stop the service.
*/
public boolean execute(Context context, final Runnable runner, int wakeLockTime, final Integer startId) {
public void execute(Context context, final Runnable runner, int wakeLockTime,
final Integer startId) {
boolean serviceShutdownScheduled = false;
final TracingWakeLock wakeLock = acquireWakeLock(context,"CoreService execute",wakeLockTime);
final boolean autoShutdown = mAutoShutdown;
// Acquire a new wakelock
final TracingWakeLock wakeLock = acquireWakeLock(context, "CoreService execute",
wakeLockTime);
// Wrap the supplied runner with code to release the wake lock and stop the service if
// appropriate.
Runnable myRunner = new Runnable() {
public void run() {
try {
// Get the sync status
boolean oldIsSyncDisabled = MailService.isSyncDisabled();
if (K9.DEBUG)
Log.d(K9.LOG_TAG, "CoreService (" + className + ") running Runnable " + runner.hashCode() + " with startId " + startId);
if (K9.DEBUG) {
Log.d(K9.LOG_TAG, "CoreService (" + className + ") running Runnable " +
runner.hashCode() + " with startId " + startId);
}
// Run the supplied code
runner.run();
// If the sync status changed while runner was executing, notify
// MessagingController
if (MailService.isSyncDisabled() != oldIsSyncDisabled) {
MessagingController.getInstance(getApplication()).systemStatusChanged();
}
} finally {
try { // Making absolutely sure the service stopping command will be executed
if (K9.DEBUG)
Log.d(K9.LOG_TAG, "CoreService (" + className + ") completed Runnable " + runner.hashCode() + " with startId " + startId);
// Making absolutely sure stopSelf() will be called
try {
if (K9.DEBUG) {
Log.d(K9.LOG_TAG, "CoreService (" + className + ") completed " +
"Runnable " + runner.hashCode() + " with startId " + startId);
}
wakeLock.release();
} finally {
if (autoShutdown && startId != null) {
stopSelf(startId); // <-- this is what is meant with "serviceShutdownScheduled"; execution of this line assures proper shutdown of the service once finished
stopSelf(startId);
}
}
}
}
};
if (threadPool == null) {
Log.e(K9.LOG_TAG, "CoreService.execute (" + className + ") called with no threadPool available; running Runnable " + runner.hashCode() + " in calling thread", new Throwable());
// TODO: remove this. we never set mThreadPool to null
if (mThreadPool == null) {
Log.e(K9.LOG_TAG, "CoreService.execute (" + className + ") called with no thread " +
"pool available; running Runnable " + runner.hashCode() +
" in calling thread");
synchronized (this) {
myRunner.run();
serviceShutdownScheduled = startId != null; // In this case it's not actually scheduled, it's already done, but that should never happen anyway
serviceShutdownScheduled = startId != null;
}
} else {
if (K9.DEBUG)
Log.d(K9.LOG_TAG, "CoreService (" + className + ") queueing Runnable " + runner.hashCode() + " with startId " + startId);
if (K9.DEBUG) {
Log.d(K9.LOG_TAG, "CoreService (" + className + ") queueing Runnable " +
runner.hashCode() + " with startId " + startId);
}
try {
threadPool.execute(myRunner);
mThreadPool.execute(myRunner);
serviceShutdownScheduled = startId != null;
} catch (RejectedExecutionException e) {
// Ignore RejectedExecutionException after we shut down the thread pool in
// onDestroy(). Still, this should not happen!
if (!mShutdown) {
throw e;
}
Log.i(K9.LOG_TAG, "CoreService: " + className + " is shutting down, ignoring rejected execution exception: " + e.getMessage());
Log.i(K9.LOG_TAG, "CoreService: " + className + " is shutting down, ignoring " +
"rejected execution exception: " + e.getMessage());
}
}
mImmediateShutdown = !serviceShutdownScheduled;
return serviceShutdownScheduled;
mImmediateShutdown = !serviceShutdownScheduled;
}
/**
* CK:Added
* To implement by sub-class instead of overriding onStart.
* This allows CoreService to do start and end operations around the sub-class's start code.
* Especially, CoreService will protect the start-code with a wake-lock to guarantee the service to have the required resources to do it's work.
* CK:Q: Is this really useful (the wakelock part)? The real work is happening in the worker-thread anyway. Maybe it is because this makes sure that whatever needs to be started by the service, it can be without being interrupted by the phone going to sleep.
* Subclasses need to implement this instead of overriding {@link #onStart(Intent, int)}.
*
* <p>
* This allows {@link CoreService} to manage the service lifecycle, incl. wake lock management.
* </p>
* @param intent
* The Intent supplied to {@link Context#startService(Intent)}.
* @param startId
* A unique integer representing this specific request to start. Use with
* {@link #stopSelfResult(int)}.
*/
public abstract void startService(Intent intent, int startId);
@Override
public IBinder onBind(@SuppressWarnings("unused") Intent intent) {
// TODO Auto-generated method stub
return null;
}
@Override
public void onLowMemory() {
Log.w(K9.LOG_TAG, "CoreService: " + className + ".onLowMemory() - Running low on memory");
}
/**
* Clean up when the service is stopped.
*/
@Override
public void onDestroy() {
if (K9.DEBUG)
if (K9.DEBUG) {
Log.i(K9.LOG_TAG, "CoreService: " + className + ".onDestroy()");
}
// Shut down thread pool
mShutdown = true;
threadPool.shutdown();
mThreadPool.shutdown();
super.onDestroy();
// MessagingController.getInstance(getApplication()).removeListener(mListener);
}
/**
* @return True if auto-shutdown is enabled
* Return whether or not auto shutdown is enabled.
*
* @return {@code true} iff auto shutdown is enabled.
*/
protected boolean isAutoShutdown() {
return mAutoShutdown;
}
/**
* Enable of disable auto-shutdown (enabled by default).
* See {@#mAutoShutdown} for more information.
* Enable or disable auto shutdown (enabled by default).
*
* @param autoShutdown
* {@code true} to enable auto shutdown. {@code false} to disable.
*
* @see #mAutoShutdown
*/
protected void setAutoShutdown(boolean autoShutdown) {
mAutoShutdown = autoShutdown;
}
@Override
public IBinder onBind(Intent intent) {
// Unused
return null;
}
}

534
src/com/fsck/k9/service/MailService.java
View File

@ -86,102 +86,92 @@ public class MailService extends CoreService {
@Override
public void startService(Intent intent, int startId) {
long startTime = System.currentTimeMillis();
try {
boolean oldIsSyncDisabled = isSyncDisabled();
ConnectivityManager connectivityManager = (ConnectivityManager)getApplication().getSystemService(Context.CONNECTIVITY_SERVICE);
boolean doBackground = true;
boolean hasConnectivity = false;
boolean oldIsSyncDisabled = isSyncDisabled();
ConnectivityManager connectivityManager = (ConnectivityManager)getApplication().getSystemService(Context.CONNECTIVITY_SERVICE);
boolean doBackground = true;
boolean hasConnectivity = false;
if (connectivityManager != null) {
NetworkInfo netInfo = connectivityManager.getActiveNetworkInfo();
if (netInfo != null) {
State state = netInfo.getState();
hasConnectivity = state == State.CONNECTED;
}
boolean backgroundData = connectivityManager.getBackgroundDataSetting();
boolean autoSync = true;
if (AutoSyncHelper.isAvailable()) {
autoSync = AutoSyncHelper.getMasterSyncAutomatically();
Log.i(K9.LOG_TAG, "AutoSync help is available, autoSync = " + autoSync);
}
K9.BACKGROUND_OPS bOps = K9.getBackgroundOps();
switch (bOps) {
case NEVER:
doBackground = false;
break;
case ALWAYS:
doBackground = true;
break;
case WHEN_CHECKED:
doBackground = backgroundData;
break;
case WHEN_CHECKED_AUTO_SYNC:
doBackground = backgroundData & autoSync;
break;
}
if (connectivityManager != null) {
NetworkInfo netInfo = connectivityManager.getActiveNetworkInfo();
if (netInfo != null) {
State state = netInfo.getState();
hasConnectivity = state == State.CONNECTED;
}
boolean backgroundData = connectivityManager.getBackgroundDataSetting();
boolean autoSync = true;
if (AutoSyncHelper.isAvailable()) {
autoSync = AutoSyncHelper.getMasterSyncAutomatically();
Log.i(K9.LOG_TAG, "AutoSync help is available, autoSync = " + autoSync);
}
syncBlocked = !(doBackground && hasConnectivity);
K9.BACKGROUND_OPS bOps = K9.getBackgroundOps();
if (K9.DEBUG)
Log.i(K9.LOG_TAG, "MailService.onStart(" + intent + ", " + startId
+ "), hasConnectivity = " + hasConnectivity + ", doBackground = " + doBackground);
switch (bOps) {
case NEVER:
doBackground = false;
break;
case ALWAYS:
doBackground = true;
break;
case WHEN_CHECKED:
doBackground = backgroundData;
break;
case WHEN_CHECKED_AUTO_SYNC:
doBackground = backgroundData & autoSync;
break;
}
// MessagingController.getInstance(getApplication()).addListener(mListener);
if (ACTION_CHECK_MAIL.equals(intent.getAction())) {
if (K9.DEBUG)
Log.i(K9.LOG_TAG, "***** MailService *****: checking mail");
if (hasConnectivity && doBackground) {
PollService.startService(this);
}
reschedulePoll(hasConnectivity, doBackground, startId, false);
} else if (ACTION_CANCEL.equals(intent.getAction())) {
if (K9.DEBUG)
Log.v(K9.LOG_TAG, "***** MailService *****: cancel");
cancel();
} else if (ACTION_RESET.equals(intent.getAction())) {
if (K9.DEBUG)
Log.v(K9.LOG_TAG, "***** MailService *****: reschedule");
rescheduleAll(hasConnectivity, doBackground, startId);
} else if (ACTION_RESTART_PUSHERS.equals(intent.getAction())) {
if (K9.DEBUG)
Log.v(K9.LOG_TAG, "***** MailService *****: restarting pushers");
reschedulePushers(hasConnectivity, doBackground, startId);
} else if (ACTION_RESCHEDULE_POLL.equals(intent.getAction())) {
if (K9.DEBUG)
Log.v(K9.LOG_TAG, "***** MailService *****: rescheduling poll");
reschedulePoll(hasConnectivity, doBackground, startId, true);
} else if (ACTION_REFRESH_PUSHERS.equals(intent.getAction())) {
if (hasConnectivity && doBackground) {
refreshPushers(null);
schedulePushers(startId);
}
} else if (CONNECTIVITY_CHANGE.equals(intent.getAction())) {
rescheduleAll(hasConnectivity, doBackground, startId);
if (K9.DEBUG)
Log.i(K9.LOG_TAG, "Got connectivity action with hasConnectivity = " + hasConnectivity + ", doBackground = " + doBackground);
} else if (CANCEL_CONNECTIVITY_NOTICE.equals(intent.getAction())) {
}
if (isSyncDisabled() != oldIsSyncDisabled) {
MessagingController.getInstance(getApplication()).systemStatusChanged();
}
} finally {
/* nothing to do */
}
syncBlocked = !(doBackground && hasConnectivity);
if (K9.DEBUG)
Log.i(K9.LOG_TAG, "MailService.onStart(" + intent + ", " + startId
+ "), hasConnectivity = " + hasConnectivity + ", doBackground = " + doBackground);
// MessagingController.getInstance(getApplication()).addListener(mListener);
if (ACTION_CHECK_MAIL.equals(intent.getAction())) {
if (K9.DEBUG)
Log.i(K9.LOG_TAG, "***** MailService *****: checking mail");
if (hasConnectivity && doBackground) {
PollService.startService(this);
}
reschedulePollInBackground(hasConnectivity, doBackground, startId, false);
} else if (ACTION_CANCEL.equals(intent.getAction())) {
if (K9.DEBUG)
Log.v(K9.LOG_TAG, "***** MailService *****: cancel");
cancel();
} else if (ACTION_RESET.equals(intent.getAction())) {
if (K9.DEBUG)
Log.v(K9.LOG_TAG, "***** MailService *****: reschedule");
rescheduleAllInBackground(hasConnectivity, doBackground, startId);
} else if (ACTION_RESTART_PUSHERS.equals(intent.getAction())) {
if (K9.DEBUG)
Log.v(K9.LOG_TAG, "***** MailService *****: restarting pushers");
reschedulePushersInBackground(hasConnectivity, doBackground, startId);
} else if (ACTION_RESCHEDULE_POLL.equals(intent.getAction())) {
if (K9.DEBUG)
Log.v(K9.LOG_TAG, "***** MailService *****: rescheduling poll");
reschedulePollInBackground(hasConnectivity, doBackground, startId, true);
} else if (ACTION_REFRESH_PUSHERS.equals(intent.getAction())) {
refreshPushersInBackground(hasConnectivity, doBackground, startId);
} else if (CONNECTIVITY_CHANGE.equals(intent.getAction())) {
rescheduleAllInBackground(hasConnectivity, doBackground, startId);
if (K9.DEBUG)
Log.i(K9.LOG_TAG, "Got connectivity action with hasConnectivity = " + hasConnectivity + ", doBackground = " + doBackground);
} else if (CANCEL_CONNECTIVITY_NOTICE.equals(intent.getAction())) {
/* do nothing */
}
if (isSyncDisabled() != oldIsSyncDisabled) {
MessagingController.getInstance(getApplication()).systemStatusChanged();
}
if (K9.DEBUG)
Log.i(K9.LOG_TAG, "MailService.onStart took " + (System.currentTimeMillis() - startTime) + "ms");
}
private void rescheduleAll(final boolean hasConnectivity, final boolean doBackground, final Integer startId) {
reschedulePoll(hasConnectivity, doBackground, null, true);
reschedulePushers(hasConnectivity, doBackground, startId);
}
@Override
public void onDestroy() {
if (K9.DEBUG)
@ -211,74 +201,131 @@ public class MailService extends CoreService {
editor.commit();
}
private void reschedulePoll(final boolean hasConnectivity, final boolean doBackground, Integer startId, final boolean considerLastCheckEnd) {
private void rescheduleAllInBackground(final boolean hasConnectivity,
final boolean doBackground, Integer startId) {
execute(getApplication(), new Runnable() {
@Override
public void run() {
reschedulePoll(hasConnectivity, doBackground, true);
reschedulePushers(hasConnectivity, doBackground);
}
}, K9.MAIL_SERVICE_WAKE_LOCK_TIMEOUT, startId);
}
private void reschedulePollInBackground(final boolean hasConnectivity,
final boolean doBackground, Integer startId, final boolean considerLastCheckEnd) {
execute(getApplication(), new Runnable() {
public void run() {
reschedulePoll(hasConnectivity, doBackground, considerLastCheckEnd);
}
}, K9.MAIL_SERVICE_WAKE_LOCK_TIMEOUT, startId);
}
private void reschedulePushersInBackground(final boolean hasConnectivity,
final boolean doBackground, Integer startId) {
execute(getApplication(), new Runnable() {
public void run() {
reschedulePushers(hasConnectivity, doBackground);
}
}, K9.MAIL_SERVICE_WAKE_LOCK_TIMEOUT, startId);
}
private void refreshPushersInBackground(boolean hasConnectivity, boolean doBackground,
Integer startId) {
if (hasConnectivity && doBackground) {
execute(getApplication(), new Runnable() {
public void run() {
int shortestInterval = -1;
Preferences prefs = Preferences.getPreferences(MailService.this);
SharedPreferences sPrefs = prefs.getPreferences();
int previousInterval = sPrefs.getInt(PREVIOUS_INTERVAL, -1);
long lastCheckEnd = sPrefs.getLong(LAST_CHECK_END, -1);
if (lastCheckEnd > System.currentTimeMillis()) {
Log.i(K9.LOG_TAG, "The database claims that the last time mail was checked was in the future. ("+lastCheckEnd+"). To try to get things back to normal, the last check time has been reset to "+System.currentTimeMillis());
lastCheckEnd = System.currentTimeMillis();
}
for (Account account : prefs.getAvailableAccounts()) {
if (account.getAutomaticCheckIntervalMinutes() != -1
&& account.getFolderSyncMode() != FolderMode.NONE
&& (account.getAutomaticCheckIntervalMinutes() < shortestInterval || shortestInterval == -1)) {
shortestInterval = account.getAutomaticCheckIntervalMinutes();
}
}
SharedPreferences.Editor editor = sPrefs.edit();
editor.putInt(PREVIOUS_INTERVAL, shortestInterval);
editor.commit();
if (shortestInterval == -1) {
nextCheck = -1;
pollingRequested = false;
if (K9.DEBUG)
Log.i(K9.LOG_TAG, "No next check scheduled for package " + getApplication().getPackageName());
cancel();
} else {
long delay = (shortestInterval * (60 * 1000));
long base = (previousInterval == -1 || lastCheckEnd == -1 || !considerLastCheckEnd ? System.currentTimeMillis() : lastCheckEnd);
long nextTime = base + delay;
if (K9.DEBUG)
Log.i(K9.LOG_TAG,
"previousInterval = " + previousInterval
+ ", shortestInterval = " + shortestInterval
+ ", lastCheckEnd = " + new Date(lastCheckEnd)
+ ", considerLastCheckEnd = " + considerLastCheckEnd);
nextCheck = nextTime;
pollingRequested = true;
try {
if (K9.DEBUG)
Log.i(K9.LOG_TAG, "Next check for package " + getApplication().getPackageName() + " scheduled for " + new Date(nextTime));
} catch (Exception e) {
// I once got a NullPointerException deep in new Date();
Log.e(K9.LOG_TAG, "Exception while logging", e);
}
Intent i = new Intent();
i.setClassName(getApplication().getPackageName(), "com.fsck.k9.service.MailService");
i.setAction(ACTION_CHECK_MAIL);
BootReceiver.scheduleIntent(MailService.this, nextTime, i);
}
refreshPushers();
schedulePushers();
}
}, K9.MAIL_SERVICE_WAKE_LOCK_TIMEOUT, startId);
}
}
private void reschedulePoll(final boolean hasConnectivity, final boolean doBackground,
boolean considerLastCheckEnd) {
if (!(hasConnectivity && doBackground)) {
if (K9.DEBUG) {
Log.i(K9.LOG_TAG, "No connectivity, canceling check for " +
getApplication().getPackageName());
}
, K9.MAIL_SERVICE_WAKE_LOCK_TIMEOUT, startId);
} else {
nextCheck = -1;
if (K9.DEBUG)
Log.i(K9.LOG_TAG, "No connectivity, canceling check for " + getApplication().getPackageName());
cancel();
return;
}
Preferences prefs = Preferences.getPreferences(MailService.this);
SharedPreferences sPrefs = prefs.getPreferences();
int previousInterval = sPrefs.getInt(PREVIOUS_INTERVAL, -1);
long lastCheckEnd = sPrefs.getLong(LAST_CHECK_END, -1);
if (lastCheckEnd > System.currentTimeMillis()) {
Log.i(K9.LOG_TAG, "The database claims that the last time mail was checked was in " +
"the future (" + lastCheckEnd + "). To try to get things back to normal, " +
"the last check time has been reset to: " + System.currentTimeMillis());
lastCheckEnd = System.currentTimeMillis();
}
int shortestInterval = -1;
for (Account account : prefs.getAvailableAccounts()) {
if (account.getAutomaticCheckIntervalMinutes() != -1 &&
account.getFolderSyncMode() != FolderMode.NONE &&
(account.getAutomaticCheckIntervalMinutes() < shortestInterval ||
shortestInterval == -1)) {
shortestInterval = account.getAutomaticCheckIntervalMinutes();
}
}
SharedPreferences.Editor editor = sPrefs.edit();
editor.putInt(PREVIOUS_INTERVAL, shortestInterval);
editor.commit();
if (shortestInterval == -1) {
if (K9.DEBUG) {
Log.i(K9.LOG_TAG, "No next check scheduled for package " +
getApplication().getPackageName());
}
nextCheck = -1;
pollingRequested = false;
cancel();
} else {
long delay = (shortestInterval * (60 * 1000));
long base = (previousInterval == -1 || lastCheckEnd == -1 ||
!considerLastCheckEnd ? System.currentTimeMillis() : lastCheckEnd);
long nextTime = base + delay;
if (K9.DEBUG) {
Log.i(K9.LOG_TAG, "previousInterval = " + previousInterval +
", shortestInterval = " + shortestInterval +
", lastCheckEnd = " + new Date(lastCheckEnd) +
", considerLastCheckEnd = " + considerLastCheckEnd);
}
nextCheck = nextTime;
pollingRequested = true;
try {
if (K9.DEBUG) {
Log.i(K9.LOG_TAG, "Next check for package " +
getApplication().getPackageName() + " scheduled for " +
new Date(nextTime));
}
} catch (Exception e) {
// I once got a NullPointerException deep in new Date();
Log.e(K9.LOG_TAG, "Exception while logging", e);
}
Intent i = new Intent();
i.setClassName(getApplication().getPackageName(), "com.fsck.k9.service.MailService");
i.setAction(ACTION_CHECK_MAIL);
BootReceiver.scheduleIntent(MailService.this, nextTime, i);
}
}
@ -286,131 +333,112 @@ public class MailService extends CoreService {
return syncBlocked || (!pollingRequested && !pushingRequested);
}
private void stopPushers(final Integer startId) {
execute(getApplication(), new Runnable() {
public void run() {
MessagingController.getInstance(getApplication()).stopAllPushing();
PushService.stopService(MailService.this);
}
}
, K9.MAIL_SERVICE_WAKE_LOCK_TIMEOUT, startId);
private void stopPushers() {
MessagingController.getInstance(getApplication()).stopAllPushing();
PushService.stopService(MailService.this);
}
private void reschedulePushers(final boolean hasConnectivity, final boolean doBackground, final Integer startId) {
execute(getApplication(), new Runnable() {
public void run() {
if (K9.DEBUG)
Log.i(K9.LOG_TAG, "Rescheduling pushers");
stopPushers(null);
if (hasConnectivity && doBackground) {
setupPushers(null);
schedulePushers(startId);
private void reschedulePushers(boolean hasConnectivity, boolean doBackground) {
if (K9.DEBUG) {
Log.i(K9.LOG_TAG, "Rescheduling pushers");
}
stopPushers();
if (!(hasConnectivity && doBackground)) {
if (K9.DEBUG) {
Log.i(K9.LOG_TAG, "Not scheduling pushers: connectivity? " + hasConnectivity +
" -- doBackground? " + doBackground);
}
return;
}
setupPushers();
schedulePushers();
}
private void setupPushers() {
boolean pushing = false;
for (Account account : Preferences.getPreferences(MailService.this).getAccounts()) {
if (K9.DEBUG)
Log.i(K9.LOG_TAG, "Setting up pushers for account " + account.getDescription());
if (account.isEnabled() && account.isAvailable(getApplicationContext())) {
pushing |= MessagingController.getInstance(getApplication()).setupPushing(account);
} else {
//TODO: setupPushing of unavailable accounts when they become available (sd-card inserted)
}
}
if (pushing) {
PushService.startService(MailService.this);
}
pushingRequested = pushing;
}
private void refreshPushers() {
try {
long nowTime = System.currentTimeMillis();
if (K9.DEBUG)
Log.i(K9.LOG_TAG, "Refreshing pushers");
Collection<Pusher> pushers = MessagingController.getInstance(getApplication()).getPushers();
for (Pusher pusher : pushers) {
long lastRefresh = pusher.getLastRefresh();
int refreshInterval = pusher.getRefreshInterval();
long sinceLast = nowTime - lastRefresh;
if (sinceLast + 10000 > refreshInterval) { // Add 10 seconds to keep pushers in sync, avoid drift
if (K9.DEBUG) {
Log.d(K9.LOG_TAG, "PUSHREFRESH: refreshing lastRefresh = " + lastRefresh + ", interval = " + refreshInterval
+ ", nowTime = " + nowTime + ", sinceLast = " + sinceLast);
}
pusher.refresh();
pusher.setLastRefresh(nowTime);
} else {
if (K9.DEBUG) {
Log.i(K9.LOG_TAG, "Not scheduling pushers: connectivity? " + hasConnectivity + " -- doBackground? " + doBackground);
Log.d(K9.LOG_TAG, "PUSHREFRESH: NOT refreshing lastRefresh = " + lastRefresh + ", interval = " + refreshInterval
+ ", nowTime = " + nowTime + ", sinceLast = " + sinceLast);
}
}
}
// Whenever we refresh our pushers, send any unsent messages
if (K9.DEBUG) {
Log.d(K9.LOG_TAG, "PUSHREFRESH: trying to send mail in all folders!");
}
MessagingController.getInstance(getApplication()).sendPendingMessages(null);
} catch (Exception e) {
Log.e(K9.LOG_TAG, "Exception while refreshing pushers", e);
}
, K9.MAIL_SERVICE_WAKE_LOCK_TIMEOUT, null);
}
private void setupPushers(final Integer startId) {
execute(getApplication(), new Runnable() {
public void run() {
boolean pushing = false;
for (Account account : Preferences.getPreferences(MailService.this).getAccounts()) {
if (K9.DEBUG)
Log.i(K9.LOG_TAG, "Setting up pushers for account " + account.getDescription());
if (account.isEnabled() && account.isAvailable(getApplicationContext())) {
pushing |= MessagingController.getInstance(getApplication()).setupPushing(account);
} else {
//TODO: setupPushing of unavailable accounts when they become available (sd-card inserted)
}
}
if (pushing) {
PushService.startService(MailService.this);
}
pushingRequested = pushing;
private void schedulePushers() {
int minInterval = -1;
Collection<Pusher> pushers = MessagingController.getInstance(getApplication()).getPushers();
for (Pusher pusher : pushers) {
int interval = pusher.getRefreshInterval();
if (interval > 0 && (interval < minInterval || minInterval == -1)) {
minInterval = interval;
}
}
, K9.MAIL_SERVICE_WAKE_LOCK_TIMEOUT, startId);
}
private void refreshPushers(final Integer startId) {
execute(getApplication(), new Runnable() {
public void run() {
try {
long nowTime = System.currentTimeMillis();
if (K9.DEBUG)
Log.i(K9.LOG_TAG, "Refreshing pushers");
Collection<Pusher> pushers = MessagingController.getInstance(getApplication()).getPushers();
for (Pusher pusher : pushers) {
long lastRefresh = pusher.getLastRefresh();
int refreshInterval = pusher.getRefreshInterval();
long sinceLast = nowTime - lastRefresh;
if (sinceLast + 10000 > refreshInterval) { // Add 10 seconds to keep pushers in sync, avoid drift
if (K9.DEBUG) {
Log.d(K9.LOG_TAG, "PUSHREFRESH: refreshing lastRefresh = " + lastRefresh + ", interval = " + refreshInterval
+ ", nowTime = " + nowTime + ", sinceLast = " + sinceLast);
}
pusher.refresh();
pusher.setLastRefresh(nowTime);
} else {
if (K9.DEBUG) {
Log.d(K9.LOG_TAG, "PUSHREFRESH: NOT refreshing lastRefresh = " + lastRefresh + ", interval = " + refreshInterval
+ ", nowTime = " + nowTime + ", sinceLast = " + sinceLast);
}
}
}
// Whenever we refresh our pushers, send any unsent messages
if (K9.DEBUG) {
Log.d(K9.LOG_TAG, "PUSHREFRESH: trying to send mail in all folders!");
}
MessagingController.getInstance(getApplication()).sendPendingMessages(null);
} catch (Exception e) {
Log.e(K9.LOG_TAG, "Exception while refreshing pushers", e);
}
}
if (K9.DEBUG) {
Log.v(K9.LOG_TAG, "Pusher refresh interval = " + minInterval);
}
, K9.MAIL_SERVICE_WAKE_LOCK_TIMEOUT, startId);
}
private void schedulePushers(final Integer startId) {
execute(getApplication(), new Runnable() {
public void run() {
int minInterval = -1;
Collection<Pusher> pushers = MessagingController.getInstance(getApplication()).getPushers();
for (Pusher pusher : pushers) {
int interval = pusher.getRefreshInterval();
if (interval > 0 && (interval < minInterval || minInterval == -1)) {
minInterval = interval;
}
}
if (K9.DEBUG) {
Log.v(K9.LOG_TAG, "Pusher refresh interval = " + minInterval);
}
if (minInterval > 0) {
long nextTime = System.currentTimeMillis() + minInterval;
if (K9.DEBUG)
Log.d(K9.LOG_TAG, "Next pusher refresh scheduled for " + new Date(nextTime));
Intent i = new Intent();
i.setClassName(getApplication().getPackageName(), "com.fsck.k9.service.MailService");
i.setAction(ACTION_REFRESH_PUSHERS);
BootReceiver.scheduleIntent(MailService.this, nextTime, i);
}
}
if (minInterval > 0) {
long nextTime = System.currentTimeMillis() + minInterval;
if (K9.DEBUG)
Log.d(K9.LOG_TAG, "Next pusher refresh scheduled for " + new Date(nextTime));
Intent i = new Intent();
i.setClassName(getApplication().getPackageName(), "com.fsck.k9.service.MailService");
i.setAction(ACTION_REFRESH_PUSHERS);
BootReceiver.scheduleIntent(MailService.this, nextTime, i);
}
, K9.MAIL_SERVICE_WAKE_LOCK_TIMEOUT, startId);
}
@Override
public IBinder onBind(@SuppressWarnings("unused") Intent intent) {
public IBinder onBind(Intent intent) {
// Unused
return null;
}

0
tests/build.properties → tests/ant.properties
View File

77
tests/build.xml
View File

@ -1,15 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="K9Test" default="help">
<project name="K9" default="help">
<!-- The local.properties file is created and updated by the 'android'
tool.
It contains the path to the SDK. It should *NOT* be checked into
Version Control Systems. -->
<property file="local.properties" />
<!-- The local.properties file is created and updated by the 'android' tool.
It contains the path to the SDK. It should *NOT* be checked into
Version Control Systems. -->
<loadproperties srcFile="local.properties" />
<!-- The build.properties file can be created by you and is never touched
by the 'android' tool. This is the place to change some of the
default property values used by the Ant rules.
<!-- The ant.properties file can be created by you. It is only edited by the
'android' tool to add properties to it.
This is the place to change some Ant specific build properties.
Here are some properties you may want to change/update:
source.dir
@ -17,6 +16,9 @@
out.dir
The name of the output directory. Default is 'bin'.
For other overridable properties, look at the beginning of the rules
files in the SDK, at tools/ant/build.xml
Properties related to the SDK location or the project target should
be updated using the 'android' tool with the 'update' action.
@ -24,26 +26,25 @@
application and should be checked into Version Control Systems.
-->
<property file="build.properties" />
<property file="ant.properties" />
<!-- The default.properties file is created and updated by the 'android'
<!-- The project.properties file is created and updated by the 'android'
tool, as well as ADT.
This contains project specific properties such as project target, and library
dependencies. Lower level build properties are stored in ant.properties
(or in .classpath for Eclipse projects).
This file is an integral part of the build system for your
application and should be checked into Version Control Systems. -->
<property file="default.properties" />
<loadproperties srcFile="project.properties" />
<!-- Custom Android task to deal with the project target, and import the
proper rules.
This requires ant 1.6.0 or above. -->
<path id="android.antlibs">
<pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
<pathelement path="${sdk.dir}/tools/lib/sdklib.jar" />
<pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" />
</path>
<!-- quick check on sdk.dir -->
<fail
message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'"
unless="sdk.dir"
/>
<taskdef name="setup"
classname="com.android.ant.SetupTask"
classpathref="android.antlibs" />
<!-- extension targets. Uncomment the ones where you want to do custom work
in between standard targets -->
@ -53,32 +54,32 @@
<target name="-pre-compile">
</target>
[This is typically used for code obfuscation.
Compiled code location: ${out.classes.absolute.dir}
If this is not done in place, override ${out.dex.input.absolute.dir}]
/* This is typically used for code obfuscation.
Compiled code location: ${out.classes.absolute.dir}
If this is not done in place, override ${out.dex.input.absolute.dir} */
<target name="-post-compile">
</target>
-->
<!-- Execute the Android Setup task that will setup some properties
specific to the target, and import the build rules files.
The rules file is imported from
<SDK>/platforms/<target_platform>/ant/ant_rules_r#.xml
<!-- Import the actual build file.
To customize existing targets, there are two options:
- Customize only one target:
- copy/paste the target into this file, *before* the
<setup> task.
<import> task.
- customize it to your needs.
- Customize the whole script.
- Customize the whole content of build.xml
- copy/paste the content of the rules files (minus the top node)
into this file, *after* the <setup> task
- disable the import of the rules by changing the setup task
below to <setup import="false" />.
into this file, replacing the <import> task.
- customize to your needs.
***********************
****** IMPORTANT ******
***********************
In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
in order to avoid having your file be overridden by tools such as "android update project"
-->
<setup />
<!-- version-tag: 1 -->
<import file="${sdk.dir}/tools/ant/build.xml" />
</project>

8
tests/proguard.cfg
View File

@ -18,14 +18,18 @@
native <methods>;
}
-keepclasseswithmembernames class * {
-keepclasseswithmembers class * {
public <init>(android.content.Context, android.util.AttributeSet);
}
-keepclasseswithmembernames class * {
-keepclasseswithmembers class * {
public <init>(android.content.Context, android.util.AttributeSet, int);
}
-keepclassmembers class * extends android.app.Activity {
public void *(android.view.View);
}
-keepclassmembers enum * {
public static **[] values();
public static ** valueOf(java.lang.String);

2
tests/default.properties → tests/project.properties
View File

@ -4,7 +4,7 @@
# This file must be checked in Version Control Systems.
#
# To customize properties used by the Ant build system use,
# "build.properties", and override values to adapt the script to your
# "ant.properties", and override values to adapt the script to your
# project structure.
# Project target.