1.0.x merged back into trunk

This commit is contained in:
Thialfihar
2010-08-15 17:32:08 +00:00
parent e6dc995126
commit bd99b2590b
8 changed files with 111 additions and 51 deletions

View File

@@ -124,6 +124,9 @@
<string name="choice_3mins">3 min</string>
<string name="choice_5mins">5 min</string>
<string name="choice_10mins">10 min</string>
<string name="choice_20mins">20 min</string>
<string name="choice_40mins">40 min</string>
<string name="choice_60mins">60 min</string>
<string name="choice_untilQuit">Indtil slut</string>
<string name="dsa">DSA</string>

View File

@@ -129,8 +129,10 @@
<string name="choice_1min">1 Min.</string>
<string name="choice_3mins">3 Min.</string>
<string name="choice_5mins">5 Min.</string>
<string name="choice_10mins">10 Min.</string>
<string name="choice_20mins">20 Min.</string>
<string name="choice_40mins">40 Min.</string>
<string name="choice_60mins">60 Min.</string>
<string name="choice_untilQuit">Bis Programmende</string>
<string name="dsa">DSA</string>

View File

@@ -126,6 +126,9 @@
<string name="choice_3mins">3 min</string>
<string name="choice_5mins">5 min</string>
<string name="choice_10mins">10 min</string>
<string name="choice_20mins">20 min</string>
<string name="choice_40mins">40 min</string>
<string name="choice_60mins">60 min</string>
<string name="choice_untilQuit">tutta la sessione</string>
<string name="dsa">DSA</string>

View File

@@ -135,6 +135,9 @@
<string name="choice_3mins">3 min</string>
<string name="choice_5mins">5 min</string>
<string name="choice_10mins">10 min</string>
<string name="choice_20mins">20 min</string>
<string name="choice_40mins">40 min</string>
<string name="choice_60mins">60 min</string>
<string name="choice_untilQuit">do izhoda</string>
<string name="choice_language_system">Sistemsko nastavljeno</string>
@@ -270,9 +273,15 @@
<string name="filterInfo">Filter: \"%s\"</string>
<!-- misc -->
<<<<<<< HEAD
<string name="fast">hitro</string>
<string name="slow">počasi</string>
<string name="very_slow">zelo počasi</string>
=======
<string name="fast">hiter</string>
<string name="slow">počasen</string>
<string name="very_slow">zelo počasen</string>
>>>>>>> 1.0.x
<!-- texts -->
<!-- "OI File Manager", "ASTRO", and "K-9 Mail" must not be translated in order for the links to the market to work. -->
@@ -280,7 +289,11 @@
\n\nZaželjeno je, da namestite programa OI File Manager ali ASTRO, ki omogočata iskanje, izbiro in vnos datotek v APG.
\n\nZa začetek potrebujete nekaj ključev. Lahko jih uvozite s klikom na menija \"Upravljanje javnih ključev\" in \"Upravljanje zasebnih ključev\" ali jih ustvarite v meniju \"Upravljanje zasebnih ključev\".
\n\nPreko menija \"Dodaj račun\" lahko dodate vaše GMail račune in tako poenostavite dešifriranje e-pošte prejete nanje.
<<<<<<< HEAD
\n\nDa bi odkrili dodatne funkcije in zmožnosti programa APG, se sprehodite skozi njegove menije.
=======
\n\Da bi odkrili dodatne funkcije in zmožnosti programa APG, se sprehodite skozi njegove menije.
>>>>>>> 1.0.x
</string>
</resources>

View File

@@ -22,6 +22,9 @@
<item>@string/choice_3mins</item>
<item>@string/choice_5mins</item>
<item>@string/choice_10mins</item>
<item>@string/choice_20mins</item>
<item>@string/choice_40mins</item>
<item>@string/choice_60mins</item>
</string-array>
<string-array name="pass_phrase_cache_ttl_values">
@@ -30,6 +33,9 @@
<item>180</item>
<item>300</item>
<item>600</item>
<item>1200</item>
<item>2400</item>
<item>3600</item>
</string-array>
<string-array name="language_entries">

View File

@@ -133,6 +133,9 @@
<string name="choice_3mins">3 mins</string>
<string name="choice_5mins">5 mins</string>
<string name="choice_10mins">10 mins</string>
<string name="choice_20mins">20 mins</string>
<string name="choice_40mins">40 mins</string>
<string name="choice_60mins">60 mins</string>
<string name="choice_untilQuit">until quit</string>
<string name="choice_language_system">System default</string>