← Back to branch summary

~ubuntu-branches/ubuntu/saucy/kde-l10n-bs/saucy

« back to all changes in this revision

Viewing changes to messages/kdesdk/fileviewgitplugin.po

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2013-01-04 22:22:10 UTC
  • mfrom: (1.1.17)
  • Revision ID: package-import@ubuntu.com-20130104222210-32twgkd5c46m3uqr
Tags: 4:4.9.97-0ubuntu1
New upstream RC

Show diffs side-by-side

added added

removed removed

Lines of Context:
messages/kdesdk/fileviewgitplugin.po
8
8
"Project-Id-Version: kdesdk\n"
9
9
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
10
10
"POT-Creation-Date: 2012-08-20 04:55+0200\n"
11
 
"PO-Revision-Date: 2011-04-15 23:44+0000\n"
 
11
"PO-Revision-Date: 2012-10-08 10:09+0000\n"
12
12
"Last-Translator: Samir Ribić <Unknown>\n"
13
13
"Language-Team: Bosnian <bs@li.org>\n"
14
14
"Language: bs\n"
15
15
"MIME-Version: 1.0\n"
16
16
"Content-Type: text/plain; charset=UTF-8\n"
17
17
"Content-Transfer-Encoding: 8bit\n"
18
 
"X-Launchpad-Export-Date: 2011-04-22 17:13+0000\n"
19
 
"X-Generator: Launchpad (build 12883)\n"
 
18
"X-Launchpad-Export-Date: 2012-12-21 01:33+0000\n"
 
19
"X-Generator: Launchpad (build 16378)\n"
20
20
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
21
21
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
22
22
 
309
309
#: fileviewgitplugin.cpp:585
310
310
msgctxt "@info:status"
311
311
msgid "Merge conflicts occurred. Fix them and commit the result."
312
 
msgstr ""
 
312
msgstr "Desili su se konflikti u spajanju. Popravite ih i pošaljite rezultat."
313
313
 
314
314
#. i18n: ectx: label, entry (commitDialogHeight), group (CommitDialogSettings)
315
315
#: fileviewgitpluginsettings.kcfg:7