diff options
| author | William Hua <william.hua@canonical.com> | 2014-04-09 08:02:00 +1200 |
|---|---|---|
| committer | William Hua <william.hua@canonical.com> | 2014-04-09 08:02:00 +1200 |
| commit | f442bede4bd7ed4f455f2714b93b2b71f20540da (patch) | |
| tree | 3eaad6c7f9d35d4490165dafd0571eb6ce45d55f /po/oc.po | |
| parent | 3aae8264b94b808195c3647384fb20bd0e72fc17 (diff) | |
| parent | 0e4cbba14d910e40cafb37199730f3387c9ce279 (diff) | |
| download | ayatana-indicator-keyboard-f442bede4bd7ed4f455f2714b93b2b71f20540da.tar.gz ayatana-indicator-keyboard-f442bede4bd7ed4f455f2714b93b2b71f20540da.tar.bz2 ayatana-indicator-keyboard-f442bede4bd7ed4f455f2714b93b2b71f20540da.zip | |
Merge 1291962-2 and resolve conflicts.
Diffstat (limited to 'po/oc.po')
| -rw-r--r-- | po/oc.po | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -7,14 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: indicator-keyboard\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2014-04-04 05:42+0000\n" +"POT-Creation-Date: 2014-04-07 06:57+0000\n" "PO-Revision-Date: 2013-10-02 06:07+0000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Occitan (post 1500) <oc@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-04-04 07:09+0000\n" +"X-Launchpad-Export-Date: 2014-04-08 07:10+0000\n" "X-Generator: Launchpad (build 16976)\n" #: ../lib/main.vala:676 |