diff options
| author | Georg Ehrke <developer@georgehrke.com> | 2013-08-05 14:27:38 +0200 |
|---|---|---|
| committer | Georg Ehrke <developer@georgehrke.com> | 2013-08-05 14:27:38 +0200 |
| commit | af983b843d1335917f4a702cea6d91d28bab68e9 (patch) | |
| tree | 692e6e4090ef282b597b9b69d2abd53262cf47a0 /l10n/ka_GE/lib.po | |
| parent | 554b1990e23c76aea182e9b8c2687f8f8b939fb9 (diff) | |
| parent | 0fce89308e2fbcb44a2091ca67f373ba89ee068e (diff) | |
| download | nextcloud-server-af983b843d1335917f4a702cea6d91d28bab68e9.tar.gz nextcloud-server-af983b843d1335917f4a702cea6d91d28bab68e9.zip | |
fix merge conflicts
Diffstat (limited to 'l10n/ka_GE/lib.po')
| -rw-r--r-- | l10n/ka_GE/lib.po | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/l10n/ka_GE/lib.po b/l10n/ka_GE/lib.po index 499f821fb1f..cbc529f5892 100644 --- a/l10n/ka_GE/lib.po +++ b/l10n/ka_GE/lib.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-07-24 01:55-0400\n" -"PO-Revision-Date: 2013-07-24 05:55+0000\n" +"POT-Creation-Date: 2013-08-04 01:55-0400\n" +"PO-Revision-Date: 2013-08-04 05:02+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n" "MIME-Version: 1.0\n" @@ -46,7 +46,7 @@ msgstr "ადმინისტრატორი" msgid "Failed to upgrade \"%s\"." msgstr "" -#: defaults.php:33 +#: defaults.php:35 msgid "web services under your control" msgstr "web services under your control" @@ -257,7 +257,7 @@ msgstr "ბოლო წელს" msgid "years ago" msgstr "წლის წინ" -#: template.php:296 +#: template.php:297 msgid "Caused by:" msgstr "" |