Merge lp:~arashbm/ubuntu-filemanager-app/translation-fix into lp:ubuntu-filemanager-app

[Arash Badie Modiri]

Translation fix

generalized translation string to support languages that don't have nouns at the
end of sentences.

[Adolfo Jayme Barrientos (fitojb)]

Awesome!

review: Approve

[Arto Jalkanen (ajalkane)]

Thank you

review: Approve

[David Planella (dpm)]

Looks good to me, sorry for the delay, and approving!

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~arashbm/ubuntu-filemanager-app/translation-fix/+merge/201691/+edit-commit-message

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-autolanding/55/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2118/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-autolanding/55/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-autolanding/55/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-autolanding/42/console

review: Needs Fixing (continuous-integration)

[David Planella (dpm)]

Hi Arash,

It looks like your branch and trunk have diverged in the meantime, would you mind doing the following, so that we can merge your branch?:

bzr branch lp:~arashbm/ubuntu-filemanager-app/translation-fix
cd translation-fix
bzr merge lp:ubuntu-filemanager-app
(fix any conflicts you encounter)
bzr commit -m"Merged from trunk" # Or any other commit message you want
bzr push lp:~arashbm/ubuntu-filemanager-app/translation-fix

This should automatically update the merge proposal in Launchpad

review: Needs Fixing

[David Planella (dpm)]

Hi Arash, in order to get this landed, I added your fix in a new branch, including authorship for the commit, so that you're properly credited.

Thus I'm marking this branch as rejected, since it's superseded by this newer one, which includes your contribution:
https://code.launchpad.net/~dpm/ubuntu-filemanager-app/translation-fix/+merge/217725

review: Disapprove

Unmerged revisions

111. By Arash Badie Modiri on 2014-01-14

Updated pot file

110. By Arash Badie Modiri on 2014-01-14

generalizing translation string to add persian (among other languages) support

=== modified file 'FolderListView.qml'
--- FolderListView.qml	2013-09-17 16:40:38 +0000
+++ FolderListView.qml	2014-01-14 23:21:35 +0000
@@ -173,7 +173,7 @@
                     PopupUtils.open(Qt.resolvedUrl("NotifyDialog.qml"), delegate,
                                     {
                                         title: i18n.tr("Folder not accessible"),
-                                        text: i18n.tr("Can not access ") + model.fileName
+                                        text: i18n.tr("Can not access %1").arg(model.fileName)
 
                                      })
                 }

=== modified file 'po/ubuntu-filemanager-app.pot'
--- po/ubuntu-filemanager-app.pot	2013-12-30 20:31:12 +0000
+++ po/ubuntu-filemanager-app.pot	2014-01-14 23:21:35 +0000
@@ -1,6 +1,6 @@
-# Filemanager App Translations
-# Copyright (C) 2013 Canonical Ltd. 
-# This file is distributed under the same license as the ubuntu-filemanager-app package.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Canonical Ltd. 
+# This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-filemanager-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-30 14:24-0600\n"
+"POT-Creation-Date: 2014-01-15 02:50+0330\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -252,7 +252,8 @@
 msgstr ""
 
 #: ../FolderListView.qml:176
-msgid "Can not access "
+#, qt-format
+msgid "Can not access %1"
 msgstr ""
 
 #: ../GoToDialog.qml:25