[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdevplatform] /: Merge branch '1.5'
From:       Aleix Pol <aleixpol () kde ! org>
Date:       2013-09-12 0:29:41
Message-ID: E1VJumz-0001gZ-F6 () scm ! kde ! org
[Download RAW message or body]

Git commit 6baf5fa5f73ce12c809373577bf5db9394f9fd5d by Aleix Pol.
Committed on 12/09/2013 at 00:28.
Pushed by apol into branch 'master'.

Merge branch '1.5'

Conflicts:
	language/codegen/tests/data/kdevcodegentest/templates/test_cpp/test_cpp.desktop
	language/codegen/tests/data/kdevcodegentest/templates/test_yaml/test_yaml.desktop
	plugins/codeutils/tests/data/testgenerationtest/templates/test_qtestlib/test_qtestlib.desktop
  plugins/codeutils/tests/data/testgenerationtest/templates/test_yaml/test_yaml.desktop
  plugins/grepview/kdevgrepview.desktop.cmake
	shell/settings/kcm_kdev_pluginsettings.desktop
	vcs/vcspluginhelper.cpp

M  +0    -1    plugins/codeutils/tests/data/testgenerationtest/templates/test_qtestlib/test_qtestlib.desktop
 M  +5    -0    plugins/codeutils/tests/data/testgenerationtest/templates/test_yaml/test_yaml.desktop
 R  +0    -1    plugins/grepview/kdevgrepview.desktop.cmake
M  +9    -8    vcs/vcspluginhelper.cpp
M  +3    -0    vcs/vcspluginhelper.h

http://commits.kde.org/kdevplatform/6baf5fa5f73ce12c809373577bf5db9394f9fd5d

diff --cc plugins/codeutils/tests/data/testgenerationtest/templates/test_qtestlib/test_qtestlib.desktop
 index d5ad5c9,f6d711e..c32e5cd
--- a/plugins/codeutils/tests/data/testgenerationtest/templates/test_qtestlib/test_qtestlib.desktop
                
+++ b/plugins/codeutils/tests/data/testgenerationtest/templates/test_qtestlib/test_qtestlib.desktop
 @@@ -81,7 -76,7 +81,6 @@@ Name[nb]=Hod
  Name[nl]=Kop
  Name[pl]=Nagłówek
  Name[pt]=Inclusão
- Name[pt_BR]=Cabeçalho
 -Name[pt_BR]=Inclusão
  Name[ru]=Заголовок
  Name[sk]=Hlavička
  Name[sl]=Glava
diff --cc plugins/codeutils/tests/data/testgenerationtest/templates/test_yaml/test_yaml.desktop
 index b2f9e8d,d6898a9..3cb8c8d
--- a/plugins/codeutils/tests/data/testgenerationtest/templates/test_yaml/test_yaml.desktop
                
+++ b/plugins/codeutils/tests/data/testgenerationtest/templates/test_yaml/test_yaml.desktop
 @@@ -3,9 -3,8 +3,14 @@@ Name=Testing YAML Templat
  Name[bs]=Testiranje YAML predloška
  Name[ca]=Plantilla YAML de prova
  Name[ca@valencia]=Plantilla YAML de prova
++<<<<<<< HEAD
 +Name[da]=Tester YAML-skabelon
 +Name[de]=Testvorlage für YAML
 +Name[el]=Δοκιμή προτύπου YAML
++=======
+ Name[de]=Testvorlage für YAML
+ Name[el]=Δοκιμή YAML template
++>>>>>>> 1.5
  Name[es]=Prueba de plantilla YAML
  Name[et]=YAML malli testimine
  Name[fi]=Testi-YAML-malli
diff --cc plugins/grepview/kdevgrepview.desktop.cmake
index 2df260b,25073d7..7b2387c
--- a/plugins/grepview/kdevgrepview.desktop.cmake
+++ b/plugins/grepview/kdevgrepview.desktop.cmake
@@@ -20,7 -22,7 +20,6 @@@ Comment[nds]=Stellt gau Dörsöken vun 
  Comment[nl]=Staat toe snel te zoeken naar meerdere bestanden met gebruik van \
patronen of reguliere expressies. En staat ook vervanging toe.  Comment[pl]=Pozwala \
na szybkie znajdowanie wielu plików wykorzystując wzorce lub regularne wyrażenia. \
Pozwala także na ich zastępowanie.  Comment[pt]=Permite pesquisar rapidamente em \
vários ficheiros, usando padrões ou expressões regulares, permitindo também \
                efectuar substituições.
- Comment[pt_BR]=Permite pesquisar rapidamente em vários arquivos, usando padrões \
                ou expressões regulares e também realizar substituições.
 -Comment[pt_BR]=Permite pesquisar rapidamente em vários arquivos, usando padrões \
ou expressões regulares. E permite realizar substituições também.  \
Comment[ru]=Позволяет быстро искать (и заменять) \
текст по множеству файлов, применяя шаблоны \
поиска или регулярные выражения.  Comment[sk]=Umožní \
rýchle hľadanie viacerých súborov pomocou vzorov alebo regulárnych výrazov a \
umožní ich nahradiť.  Comment[sl]=Omogoča hitro iskanje po več datotekah, z \
uporabo vzorcev ali pa logičnih izrazov. Omogoča tudi zamenjave.


[prev in list] [next in list] [prev in thread] [next in thread]