diff options
| author | Thialfihar <thialfihar@gmail.com> | 2010-08-15 17:32:08 +0000 |
|---|---|---|
| committer | Thialfihar <thialfihar@gmail.com> | 2010-08-15 17:32:08 +0000 |
| commit | bd99b2590b9b619d90ce5ffe36d5526452883cbf (patch) | |
| tree | 4361314a196beda8b03811db12442efdf4cc1f69 /res/values-sl | |
| parent | e6dc9951268e89c776cad141c8ce0d68ea1e559b (diff) | |
| download | open-keychain-bd99b2590b9b619d90ce5ffe36d5526452883cbf.tar.gz open-keychain-bd99b2590b9b619d90ce5ffe36d5526452883cbf.tar.bz2 open-keychain-bd99b2590b9b619d90ce5ffe36d5526452883cbf.zip | |
1.0.x merged back into trunk
Diffstat (limited to 'res/values-sl')
| -rw-r--r-- | res/values-sl/strings.xml | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index dcb002f8f..d15f6ac05 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -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> |