summaryrefslogtreecommitdiffstats
path: root/l10n/sk_SK/core.po
diff options
context:
space:
mode:
authorBjörn Schießle <schiessle@owncloud.com>2013-06-10 12:12:07 +0200
committerBjörn Schießle <schiessle@owncloud.com>2013-06-10 12:12:07 +0200
commit13017ce9e114d84ba9b4ced240e5648447fdfe45 (patch)
tree5a4ae7b311319a239d9c6792cefc879b5558d1cc /l10n/sk_SK/core.po
parentb25ab94a08ab9ba5e322043ac470d5352d456c71 (diff)
parentdb06b906e50d7d1b7eca28f51db913af1fbc81f1 (diff)
downloadnextcloud-server-13017ce9e114d84ba9b4ced240e5648447fdfe45.tar.gz
nextcloud-server-13017ce9e114d84ba9b4ced240e5648447fdfe45.zip
Merge branch 'master' into files_encryption_check_private_key
Conflicts: settings/ajax/changepassword.php
Diffstat (limited to 'l10n/sk_SK/core.po')
-rw-r--r--l10n/sk_SK/core.po14
1 files changed, 7 insertions, 7 deletions
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index 48c5076a60a..42d78354876 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-31 01:58+0200\n"
-"PO-Revision-Date: 2013-05-30 23:15+0000\n"
+"POT-Creation-Date: 2013-06-10 01:58+0200\n"
+"PO-Revision-Date: 2013-06-09 23:17+0000\n"
"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
@@ -217,23 +217,23 @@ msgstr "pred rokmi"
msgid "Choose"
msgstr "Výber"
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
msgid "Cancel"
msgstr "Zrušiť"
-#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
msgid "Error loading file picker template"
msgstr ""
-#: js/oc-dialogs.js:161
+#: js/oc-dialogs.js:164
msgid "Yes"
msgstr "Áno"
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
msgid "No"
msgstr "Nie"
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
msgid "Ok"
msgstr "Ok"