소스 검색

Solved conflict

Christian Perrier 17 년 전
부모
커밋
95d02da20d
1개의 변경된 파일3개의 추가작업 그리고 5개의 파일을 삭제
  1. 3 5
      debian/changelog

+ 3 - 5
debian/changelog

@@ -18,19 +18,17 @@ dpkg (1.14.23) UNRELEASED; urgency=low
 
 
   [ Updated dpkg translations ]
   [ Updated dpkg translations ]
   * Catalan (Jordi Mallach).
   * Catalan (Jordi Mallach).
+  * French (Christian Perrier)
   * German (Sven Joachim).
   * German (Sven Joachim).
   * Greek (Emmanuel Galatoulas). Closes: #498585
   * Greek (Emmanuel Galatoulas). Closes: #498585
+  * Korean (Changwoo Ryu). Closes: #505777
   * Polish (Wiktor Wandachowicz).
   * Polish (Wiktor Wandachowicz).
   * Portuguese (Miguel Figueiredo)
   * Portuguese (Miguel Figueiredo)
   * Russian (Yuri Kozlov). Closes: #499028, #505735
   * Russian (Yuri Kozlov). Closes: #499028, #505735
-  * Swedish (Peter Krefting).
-  * French (Christian Perrier)
-  * Koren (Changwoo Ryu). Closes: #505777
-  * Polish (Wiktor Wandachowicz).
 
 
   [ Updated scripts translations ]
   [ Updated scripts translations ]
   * Fix typo in Russian. Closes: #499736
   * Fix typo in Russian. Closes: #499736
-  * Fix wrong transaltion in French. Closes: #504123
+  * Fix wrong translation in French. Closes: #504123
   * Completed French.
   * Completed French.
 
 
  -- Raphael Hertzog <hertzog@debian.org>  Fri, 05 Sep 2008 17:33:10 +0200
  -- Raphael Hertzog <hertzog@debian.org>  Fri, 05 Sep 2008 17:33:10 +0200